diff --git a/.gitignore b/.gitignore index 3eec782..1f229a3 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,9 @@ Temporary Items *.classpath *.project *.prefs -/target/ +target/ /bin/ *.iml -/.idea/ \ No newline at end of file +/.idea/ + +.flattened-pom.xml \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index b8dfb29..762eabc 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,10 +1,10 @@ - - - - - + + + + + - \ No newline at end of file + diff --git a/Minepacks-API/README.md b/Minepacks-API/README.md new file mode 100644 index 0000000..1165344 --- /dev/null +++ b/Minepacks-API/README.md @@ -0,0 +1,61 @@ + +[banner]: https://pcgamingfreaks.at/images/minepacks.png +[spigot]: https://www.spigotmc.org/resources/minepacks.19286/ +[license]: https://github.com/GeorgH93/Minepacks/blob/master/LICENSE +[licenseImg]: https://img.shields.io/github/license/GeorgH93/Minepacks.svg +[ci]: https://ci.pcgamingfreaks.at/job/Minepacks%20API/ +[ciImg]: https://ci.pcgamingfreaks.at/job/Minepacks%20API/badge/icon +[apiVersionImg]: https://img.shields.io/badge/dynamic/xml.svg?label=api-version&query=%2F%2Frelease[1]&url=https%3A%2F%2Frepo.pcgamingfreaks.at%2Frepository%2Fmaven-releases%2Fat%2Fpcgamingfreaks%2FMinepacks-API%2Fmaven-metadata.xml +[apiJavaDoc]: https://ci.pcgamingfreaks.at/job/Minepacks%20API/javadoc/ +[apiBuilds]: https://ci.pcgamingfreaks.at/job/Minepacks%20API/ + + +[![Logo][banner]][spigot] + +This branch holds the API for the Minepacks plugin. + +[![ciImg]][ci] [![apiVersionImg]][apiJavaDoc] [![licenseImg]][license] + +## Adding it to your plugin +### Maven +The API is available through maven. +#### Repository: +``` + + pcgf-repo + https://repo.pcgamingfreaks.at/repository/maven-everything + +``` +#### Dependency: +``` + + + at.pcgamingfreaks + Minepacks-API + 2.2 + +``` + +### Build from source: +``` +git clone https://github.com/GeorgH93/Minepacks.git +cd Minepacks +mvn -pl Minepacks-API +``` + +### Get access to the API: +```java +public MinepacksPlugin getMinepacks() { + Plugin bukkitPlugin = Bukkit.getPluginManager().getPlugin("Minepacks"); + if(!(bukkitPlugin instanceof MinepacksPlugin)) { + // Do something if Minepacks is not available + return null; + } + return (MinepacksPlugin) bukkitPlugin; +} +``` +You can now use the returned `MinepacksPlugin` object to interact with the Minepacks plugin. + +## Links +* [JavaDoc][apiJavaDoc] +* [API Build Server][apiBuilds] diff --git a/Minepacks-API/pom.xml b/Minepacks-API/pom.xml new file mode 100644 index 0000000..18b179a --- /dev/null +++ b/Minepacks-API/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + Minepacks-API + + Minepacks-Parent + at.pcgamingfreaks + ${revision} + .. + + ${revision} + jar + + Minepacks-API + API for the Bukkit/Spigot plugin Minepacks. + + + + at.pcgamingfreaks + PluginLib + 1.0.17-SNAPSHOT + provided + + + + + clean install + src + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + + + + + \ No newline at end of file diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Backpack.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Backpack.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/Backpack.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Backpack.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Callback.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Callback.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/Callback.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Callback.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java rename to Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java diff --git a/Minepacks/pom.xml b/Minepacks/pom.xml new file mode 100644 index 0000000..d93ac6c --- /dev/null +++ b/Minepacks/pom.xml @@ -0,0 +1,310 @@ + + 4.0.0 + Minepacks + + Minepacks-Parent + at.pcgamingfreaks + ${revision} + .. + + ${revision} + jar + + Minepacks + Minepacks is a backpack plugin with different backpack sizes, multi language support and SQLite and MySQL storage support. + https://www.spigotmc.org/resources/19286/ + 2014 + + + GeorgH93 + ${project.version} + depend: [ PCGF_PluginLib ] + ${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId} + + + + + + at.pcgamingfreaks + Minepacks-API + ${revision} + + + + at.pcgamingfreaks + PluginLib + 1.0.21-SNAPSHOT + + + + at.pcgamingfreaks + BadRabbit-Bukkit + 1.4 + + + + org.projectlombok + lombok + 1.18.10 + provided + + + + + clean package + src + test/src + + + resources + true + + + ./ + + LICENSE + + + + ${project.build.directory}/generated-resources + + + + + + org.projectlombok + lombok-maven-plugin + 1.18.10.0 + + + generate-sources + + delombok + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + false + false + + + at.pcgamingfreaks:Minepacks-API + + + + + + + + + + + + ExcludeBadRabbit + + true + + + + + maven-jar-plugin + 3.1.2 + + + default-jar + package + + jar + + + + at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.class + + + + + + + + + + Standalone + + false + + + ${project.version}-Standalone + + ${project.groupId}.${project.artifactId}Standalone.Bukkit.${project.artifactId} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + true + Standalone + false + true + ${project.build.directory} + + + at.pcgamingfreaks:Minepacks-API + at.pcgamingfreaks:PluginLib + + + + + at.pcgf.libs + at.pcgamingfreaks.MinepacksStandalone.libs + + + at.pcgamingfreaks.Minepacks + at.pcgamingfreaks.MinepacksStandalone + + at.pcgamingfreaks.Minepacks.Bukkit.API.* + + + + at.pcgamingfreaks + at.pcgamingfreaks.MinepacksStandalone.libs.at.pcgamingfreaks + + at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack + at.pcgamingfreaks.Minepacks.Bukkit.API.Callback + at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin + at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager + + + + + + at.pcgamingfreaks:PluginLib + + *.yml + + + + + + + + + + org.sonatype.plugins + munge-maven-plugin + 1.0 + + + munge + generate-sources + + munge + + + STANDALONE + + + + + + + + + Release + + false + + + ${project.version}-Release + softdepend: [ PCGF_PluginLib ] + ${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId}BadRabbit + + + + at.pcgamingfreaks + Minepacks + ${project.version} + Standalone + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + true + Release + false + false + + + at.pcgamingfreaks:Minepacks-API + at.pcgamingfreaks:BadRabbit + at.pcgamingfreaks:Minepacks + + + + + at.pcgamingfreaks.BadRabbit + at.pcgamingfreaks.Minepacks + + + + + + + + org.codehaus.mojo + license-maven-plugin + 1.20 + + test,provided,system + true + ${project.build.directory}/generated-resources/licenses-THIRD-PARTY.xml + + + + add-third-party + generate-resources + + add-third-party + download-licenses + + + + + + + + + diff --git a/resources/config.yml b/Minepacks/resources/config.yml similarity index 100% rename from resources/config.yml rename to Minepacks/resources/config.yml diff --git a/resources/lang/chs.yml b/Minepacks/resources/lang/chs.yml similarity index 100% rename from resources/lang/chs.yml rename to Minepacks/resources/lang/chs.yml diff --git a/resources/lang/cz.yml b/Minepacks/resources/lang/cz.yml similarity index 100% rename from resources/lang/cz.yml rename to Minepacks/resources/lang/cz.yml diff --git a/resources/lang/de.yml b/Minepacks/resources/lang/de.yml similarity index 100% rename from resources/lang/de.yml rename to Minepacks/resources/lang/de.yml diff --git a/resources/lang/en.yml b/Minepacks/resources/lang/en.yml similarity index 100% rename from resources/lang/en.yml rename to Minepacks/resources/lang/en.yml diff --git a/resources/lang/es.yml b/Minepacks/resources/lang/es.yml similarity index 100% rename from resources/lang/es.yml rename to Minepacks/resources/lang/es.yml diff --git a/resources/lang/fr.yml b/Minepacks/resources/lang/fr.yml similarity index 100% rename from resources/lang/fr.yml rename to Minepacks/resources/lang/fr.yml diff --git a/resources/lang/hu.yml b/Minepacks/resources/lang/hu.yml similarity index 100% rename from resources/lang/hu.yml rename to Minepacks/resources/lang/hu.yml diff --git a/resources/lang/ja.yml b/Minepacks/resources/lang/ja.yml similarity index 100% rename from resources/lang/ja.yml rename to Minepacks/resources/lang/ja.yml diff --git a/resources/lang/nl.yml b/Minepacks/resources/lang/nl.yml similarity index 100% rename from resources/lang/nl.yml rename to Minepacks/resources/lang/nl.yml diff --git a/resources/lang/pt.yml b/Minepacks/resources/lang/pt.yml similarity index 100% rename from resources/lang/pt.yml rename to Minepacks/resources/lang/pt.yml diff --git a/resources/lang/ru.yml b/Minepacks/resources/lang/ru.yml similarity index 100% rename from resources/lang/ru.yml rename to Minepacks/resources/lang/ru.yml diff --git a/resources/lang/tr.yml b/Minepacks/resources/lang/tr.yml similarity index 100% rename from resources/lang/tr.yml rename to Minepacks/resources/lang/tr.yml diff --git a/resources/plugin.yml b/Minepacks/resources/plugin.yml similarity index 100% rename from resources/plugin.yml rename to Minepacks/resources/plugin.yml diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Files.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Files.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Files.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Files.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/InventoryCompressor.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/InventoryCompressor.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/InventoryCompressor.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/InventoryCompressor.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/OldFileUpdater.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/OldFileUpdater.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/OldFileUpdater.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/OldFileUpdater.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/WorldBlacklistMode.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/WorldBlacklistMode.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/WorldBlacklistMode.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Helper/WorldBlacklistMode.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/InventorySerializer.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/InventorySerializer.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/InventorySerializer.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/InventorySerializer.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Language.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Language.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Language.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Language.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/FilesToSQLMigration.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/FilesToSQLMigration.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/FilesToSQLMigration.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/FilesToSQLMigration.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/Migration.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/Migration.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/Migration.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/Migration.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationCallback.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationCallback.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationCallback.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationCallback.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationManager.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationManager.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationManager.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationManager.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationResult.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationResult.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationResult.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/MigrationResult.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoFilesMigration.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoFilesMigration.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoFilesMigration.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoFilesMigration.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoSQLMigration.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoSQLMigration.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoSQLMigration.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/SQLtoSQLMigration.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/ToSQLMigration.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/ToSQLMigration.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/ToSQLMigration.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Migration/ToSQLMigration.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MySQL.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MySQL.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MySQL.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MySQL.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQLite.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQLite.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQLite.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQLite.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/Interval.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/Interval.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/Interval.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/Interval.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/IntervalChecked.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/IntervalChecked.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/IntervalChecked.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/IntervalChecked.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnect.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnect.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnect.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnect.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnectDelayed.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnectDelayed.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnectDelayed.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/OnDisconnectDelayed.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/UnCacheStrategie.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/UnCacheStrategie.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/UnCacheStrategie.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/UnCacheStrategies/UnCacheStrategie.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/ItemsCollector.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/ItemsCollector.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/ItemsCollector.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/ItemsCollector.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/BackpackEventListener.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/BackpackEventListener.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/BackpackEventListener.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/BackpackEventListener.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DisableShulkerboxes.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DropOnDeath.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DropOnDeath.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DropOnDeath.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DropOnDeath.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemShortcut.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/MinepacksListener.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/MinepacksListener.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/MinepacksListener.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/MinepacksListener.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/MagicValues.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MagicValues.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/MagicValues.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MagicValues.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java diff --git a/src/at/pcgamingfreaks/Minepacks/Bukkit/Permissions.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Permissions.java similarity index 100% rename from src/at/pcgamingfreaks/Minepacks/Bukkit/Permissions.java rename to Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Permissions.java diff --git a/test/src/.keep b/Minepacks/test/src/.keep similarity index 100% rename from test/src/.keep rename to Minepacks/test/src/.keep diff --git a/pom.xml b/pom.xml index 64fdd02..2485f87 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 at.pcgamingfreaks - Minepacks - 2.2-BETA + Minepacks-Parent + ${revision} + pom scm:git:git@github.com:GeorgH93/Minepacks.git @@ -19,7 +20,7 @@ https://ci.pcgamingfreaks.at/job/Minepacks/ - Minepacks + Minepacks-Parent Minepacks is a backpack plugin with different backpack sizes, multi language support and SQLite and MySQL storage support. https://www.spigotmc.org/resources/19286/ 2014 @@ -31,10 +32,7 @@ - GeorgH93 - ${project.version} - depend: [ PCGF_PluginLib ] - ${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId} + 2.2-BETA UTF-8 UTF-8 @@ -51,22 +49,6 @@ - - - at.pcgamingfreaks - Minepacks-API - 2.2-SNAPSHOT - - - org.bukkit - bukkit - - - at.pcgamingfreaks - PluginLib - - - org.bukkit @@ -74,46 +56,10 @@ 1.15.2-R0.1-SNAPSHOT provided - - - at.pcgamingfreaks - PluginLib - 1.0.21-SNAPSHOT - - - - at.pcgamingfreaks - BadRabbit-Bukkit - 1.4 - - - - org.projectlombok - lombok - 1.18.10 - provided - clean package - src - test/src - - - resources - true - - - ./ - - LICENSE - - - - ${project.build.directory}/generated-resources - - maven-compiler-plugin @@ -123,242 +69,50 @@ 1.8 - - org.projectlombok - lombok-maven-plugin - 1.18.10.0 + org.codehaus.mojo + flatten-maven-plugin + 1.2.1 + + true + + + + + + + + + + + + + + - generate-sources + flatten + process-resources - delombok + flatten - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - package + flatten.clean + clean - shade + clean - - false - false - - - at.pcgamingfreaks:Minepacks-API - - - - - - ExcludeBadRabbit - - true - - - - - maven-jar-plugin - 3.1.2 - - - default-jar - package - - jar - - - - at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.class - - - - - - - - - - Standalone - - false - - - ${project.version}-Standalone - - ${project.groupId}.${project.artifactId}Standalone.Bukkit.${project.artifactId} - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - true - Standalone - false - true - ${project.build.directory} - - - at.pcgamingfreaks:Minepacks-API - at.pcgamingfreaks:PluginLib - - - - - at.pcgf.libs - at.pcgamingfreaks.MinepacksStandalone.libs - - - at.pcgamingfreaks.Minepacks - at.pcgamingfreaks.MinepacksStandalone - - at.pcgamingfreaks.Minepacks.Bukkit.API.* - - - - at.pcgamingfreaks - at.pcgamingfreaks.MinepacksStandalone.libs.at.pcgamingfreaks - - at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack - at.pcgamingfreaks.Minepacks.Bukkit.API.Callback - at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin - at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager - - - - - - at.pcgamingfreaks:PluginLib - - *.yml - - - - - - - - - - org.sonatype.plugins - munge-maven-plugin - 1.0 - - - munge - generate-sources - - munge - - - STANDALONE - - - - - - - - - Release - - false - - - ${project.version}-Release - softdepend: [ PCGF_PluginLib ] - ${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId}BadRabbit - - - - at.pcgamingfreaks - Minepacks - ${project.version} - Standalone - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - true - Release - false - false - - - at.pcgamingfreaks:Minepacks-API - at.pcgamingfreaks:BadRabbit - at.pcgamingfreaks:Minepacks - - - - - at.pcgamingfreaks.BadRabbit - at.pcgamingfreaks.Minepacks - - - - - - - - org.codehaus.mojo - license-maven-plugin - 1.20 - - test,provided,system - true - ${project.build.directory}/generated-resources/licenses-THIRD-PARTY.xml - - - - add-third-party - generate-resources - - add-third-party - download-licenses - - - - - - - - + + Minepacks-API + Minepacks +