From f316bdd66e000ca85cc56a1c3ab6531d400f8b9d Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Sun, 16 Aug 2020 23:05:26 +0200 Subject: [PATCH] Split the API into two APIs the normal API is always available, the extended API is only available form within the plugin or when the plugin is running in normal mode --- Minepacks-API-Extended/pom.xml | 68 +++++++++++++++++++ .../Bukkit/ExtendedAPI}/MinepacksCommand.java | 6 +- .../ExtendedAPI}/MinepacksCommandManager.java | 5 +- .../ExtendedAPI/MinepacksPlayerExtended.java | 31 +++++++++ .../ExtendedAPI/MinepacksPluginExtended.java | 32 +++++++++ Minepacks-API/pom.xml | 10 --- .../Minepacks/Bukkit/API/ItemFilter.java | 3 +- .../Minepacks/Bukkit/API/MinepacksPlayer.java | 6 -- .../Minepacks/Bukkit/API/MinepacksPlugin.java | 8 --- Minepacks/pom.xml | 34 ++++++---- .../Bukkit/Command/BackupCommand.java | 2 +- .../Bukkit/Command/ClearCommand.java | 2 +- .../Bukkit/Command/CommandManager.java | 6 +- .../Bukkit/Command/DebugCommand.java | 2 +- .../Minepacks/Bukkit/Command/HelpCommand.java | 2 +- .../Bukkit/Command/MigrateCommand.java | 2 +- .../Minepacks/Bukkit/Command/OpenCommand.java | 2 +- .../Bukkit/Command/ReloadCommand.java | 2 +- .../Bukkit/Command/RestoreCommand.java | 2 +- .../Bukkit/Command/ShortcutCommand.java | 2 +- .../Minepacks/Bukkit/Command/SortCommand.java | 2 +- .../Bukkit/Command/UpdateCommand.java | 4 +- .../Bukkit/Command/VersionCommand.java | 2 +- .../Bukkit/Database/MinepacksPlayerData.java | 4 +- .../Minepacks/Bukkit/Minepacks.java | 6 +- pom.xml | 4 ++ 26 files changed, 181 insertions(+), 68 deletions(-) create mode 100644 Minepacks-API-Extended/pom.xml rename {Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API => Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI}/MinepacksCommand.java (97%) rename {Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API => Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI}/MinepacksCommandManager.java (92%) create mode 100644 Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPlayerExtended.java create mode 100644 Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java diff --git a/Minepacks-API-Extended/pom.xml b/Minepacks-API-Extended/pom.xml new file mode 100644 index 0000000..ee127ae --- /dev/null +++ b/Minepacks-API-Extended/pom.xml @@ -0,0 +1,68 @@ + + 4.0.0 + Minepacks-API-Extended + + Minepacks-Parent + at.pcgamingfreaks + ${revision} + .. + + ${revision} + jar + + Minepacks-API-Extended + Extended API for the Bukkit/Spigot plugin Minepacks. The extended API is only available when the plugin is running in normal mode! + + + + at.pcgamingfreaks + Minepacks-API + ${revision} + + + at.pcgamingfreaks.pcgf_pluginlib + pcgf_pluginlib-bukkit + ${pcgfPluginLibVersion} + provided + + + + + clean install + + + + 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 + + + none + 8 + + + + + + + \ No newline at end of file diff --git a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommand.java similarity index 97% rename from Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java rename to Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommand.java index 885b2d8..6ea2707 100644 --- a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommand.java +++ b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommand.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package at.pcgamingfreaks.Minepacks.Bukkit.API; +package at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI; import at.pcgamingfreaks.Bukkit.Command.SubCommand; import at.pcgamingfreaks.Bukkit.Message.Message; @@ -37,7 +37,7 @@ */ public abstract class MinepacksCommand extends SubCommand { - private static MinepacksPlugin minepacksPlugin = null; + private static MinepacksPluginExtended minepacksPlugin = null; private static Method showHelp = null; private static Message messageNoPermission = new Message(ChatColor.RED + "You don't have the permission to do that."); private static Message messageNotFromConsole = new Message(ChatColor.RED + "This command can't be used from console!"); @@ -95,7 +95,7 @@ public MinepacksCommand(@NotNull JavaPlugin plugin, @NotNull String name, @NotNu * * @return The instance of the marriage master plugin. */ - protected @NotNull MinepacksPlugin getMinepacksPlugin() + protected @NotNull MinepacksPluginExtended getMinepacksPlugin() { return minepacksPlugin; } diff --git a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommandManager.java similarity index 92% rename from Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java rename to Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommandManager.java index 80e6edf..550ac87 100644 --- a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksCommandManager.java +++ b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksCommandManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 GeorgH93 + * Copyright (C) 2020 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,11 +15,10 @@ * along with this program. If not, see . */ -package at.pcgamingfreaks.Minepacks.Bukkit.API; +package at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI; import org.jetbrains.annotations.NotNull; -@SuppressWarnings("unused") public interface MinepacksCommandManager { /** diff --git a/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPlayerExtended.java b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPlayerExtended.java new file mode 100644 index 0000000..6b753d3 --- /dev/null +++ b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPlayerExtended.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2020 GeorgH93 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI; + +import at.pcgamingfreaks.Bukkit.Message.IMessage; +import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlayer; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public interface MinepacksPlayerExtended extends MinepacksPlayer +{ + void send(@NotNull IMessage message, @Nullable Object... args); + + void sendMessage(@NotNull IMessage message, @Nullable Object... args); +} \ No newline at end of file diff --git a/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java new file mode 100644 index 0000000..ffea384 --- /dev/null +++ b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2020 GeorgH93 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI; + +import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin; + +import org.jetbrains.annotations.Nullable; + +public interface MinepacksPluginExtended extends MinepacksPlugin +{ + /** + * Gets the command manager of the Minepacks plugin. + * + * @return The command manager instance. null if the plugin is running in standalone mode + */ + @Nullable MinepacksCommandManager getCommandManager(); +} \ No newline at end of file diff --git a/Minepacks-API/pom.xml b/Minepacks-API/pom.xml index 3ab84ed..e21ce56 100644 --- a/Minepacks-API/pom.xml +++ b/Minepacks-API/pom.xml @@ -14,18 +14,8 @@ Minepacks-API API for the Bukkit/Spigot plugin Minepacks. - - - at.pcgamingfreaks - PluginLib - 1.0.17-SNAPSHOT - provided - - - clean install - src diff --git a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java index 1673ad2..d73b6d7 100644 --- a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java +++ b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/ItemFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 GeorgH93 + * Copyright (C) 2020 GeorgH93 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("unused") public interface ItemFilter { /** diff --git a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlayer.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlayer.java index eb1051b..5cf6435 100644 --- a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlayer.java +++ b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlayer.java @@ -17,8 +17,6 @@ package at.pcgamingfreaks.Minepacks.Bukkit.API; -import at.pcgamingfreaks.Bukkit.Message.IMessage; - import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -48,8 +46,4 @@ public interface MinepacksPlayer @Nullable ItemStack getBackpackItem(); @NotNull Backpack getBackpack(); - - void send(@NotNull IMessage message, @Nullable Object... args); - - void sendMessage(@NotNull IMessage message, @Nullable Object... args); } \ No newline at end of file diff --git a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java index 6aabb3c..3c6fbac 100644 --- a/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java +++ b/Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/MinepacksPlugin.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@SuppressWarnings("unused") public interface MinepacksPlugin { /** @@ -114,13 +113,6 @@ public interface MinepacksPlugin */ void getBackpack(@NotNull final OfflinePlayer owner, @NotNull final Callback callback, boolean createNewIfNotExists); - /** - * Gets the command manager of the Minepacks plugin. - * - * @return The command manager instance. null if the plugin is running in standalone mode - */ - @Nullable MinepacksCommandManager getCommandManager(); - /** * Checks if the player is allowed to open a backpack based on is permissions and current game-mode. * diff --git a/Minepacks/pom.xml b/Minepacks/pom.xml index 07cea07..9a4ad74 100644 --- a/Minepacks/pom.xml +++ b/Minepacks/pom.xml @@ -31,14 +31,15 @@ at.pcgamingfreaks - Minepacks-API + Minepacks-API-Extended ${revision} - at.pcgamingfreaks - PluginLib - 1.0.30-SNAPSHOT + at.pcgamingfreaks.pcgf_pluginlib + pcgf_pluginlib-plugin-bukkit + ${pcgfPluginLibVersion} + provided @@ -56,7 +57,7 @@ - clean package test + clean test package src test/src @@ -96,6 +97,7 @@ at.pcgamingfreaks:Minepacks-API + at.pcgamingfreaks:Minepacks-API-Extended @@ -145,6 +147,13 @@ ${project.groupId}.${project.artifactId}Standalone.Bukkit.${project.artifactId} Standalone + + + at.pcgamingfreaks + PluginLib + ${pcgfPluginLibVersion} + + @@ -167,6 +176,7 @@ at.pcgamingfreaks:Minepacks-API + at.pcgamingfreaks:Minepacks-API-Extended at.pcgamingfreaks:PluginLib @@ -174,9 +184,9 @@ at.pcgamingfreaks:PluginLib - at/pcgamingfreaks/Bukkit/Particles/** - at/pcgamingfreaks/Bungee/** - at/pcgamingfreaks/PluginLib/** + at/pcgamingfreaks/Bukkit/Particles/** + at/pcgamingfreaks/Bungee/** + at/pcgamingfreaks/PluginLib/** @@ -196,12 +206,7 @@ at.pcgamingfreaks at.pcgamingfreaks.MinepacksStandalone.libs.at.pcgamingfreaks - at.pcgamingfreaks.Minepacks.Bukkit.API.Events.** - 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.**.IMessage + at.pcgamingfreaks.Minepacks.Bukkit.API.** @@ -270,6 +275,7 @@ at.pcgamingfreaks:Minepacks-API + at.pcgamingfreaks:Minepacks-API-Extended at.pcgamingfreaks:BadRabbit-Bukkit at.pcgamingfreaks:Minepacks diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java index 8461a2a..acad1e2 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/BackupCommand.java @@ -22,7 +22,7 @@ import at.pcgamingfreaks.Command.HelpData; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java index 5e4e5ef..cfb55e6 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java @@ -22,7 +22,7 @@ import at.pcgamingfreaks.Command.HelpData; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java index a7856b9..720236d 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java @@ -18,14 +18,14 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; import at.pcgamingfreaks.Bukkit.Command.CommandExecutorWithSubCommandsGeneric; +import at.pcgamingfreaks.Bukkit.Command.RegisterablePluginCommand; import at.pcgamingfreaks.Bukkit.MCVersion; import at.pcgamingfreaks.Bukkit.Message.Message; -import at.pcgamingfreaks.Bukkit.RegisterablePluginCommand; import at.pcgamingfreaks.Command.HelpData; import at.pcgamingfreaks.ConsoleColor; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager; import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommandManager; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Reflection; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java index e2e73d4..df2a9e9 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java @@ -23,7 +23,7 @@ import at.pcgamingfreaks.Message.MessageClickEvent; import at.pcgamingfreaks.Message.MessageColor; import at.pcgamingfreaks.Message.MessageFormat; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java index 1a36934..f11bf4f 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/HelpCommand.java @@ -19,7 +19,7 @@ import at.pcgamingfreaks.Bukkit.Message.Message; import at.pcgamingfreaks.Command.HelpData; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import org.bukkit.command.CommandSender; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java index 6f117fd..a8aa0ca 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/MigrateCommand.java @@ -18,8 +18,8 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; import at.pcgamingfreaks.Command.HelpData; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Database.Migration.MigrationManager; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java index f377902..45cabe1 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/OpenCommand.java @@ -22,7 +22,7 @@ import at.pcgamingfreaks.Calendar.TimeSpan; import at.pcgamingfreaks.Command.HelpData; import at.pcgamingfreaks.Message.MessageClickEvent; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java index 620cf05..297284d 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ReloadCommand.java @@ -18,7 +18,7 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; import at.pcgamingfreaks.Bukkit.Message.Message; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java index 1c82e0d..e5d455b 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java @@ -22,7 +22,7 @@ import at.pcgamingfreaks.Message.MessageClickEvent; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; import at.pcgamingfreaks.StringUtils; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ShortcutCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ShortcutCommand.java index 91cd7e3..eced7f8 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ShortcutCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ShortcutCommand.java @@ -23,7 +23,7 @@ import at.pcgamingfreaks.Bukkit.Message.Message; import at.pcgamingfreaks.Bukkit.Utils; import at.pcgamingfreaks.Command.HelpData; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Item.ItemConfig; import at.pcgamingfreaks.Minepacks.Bukkit.Listener.ItemShortcut; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/SortCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/SortCommand.java index 7601971..d0d7f52 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/SortCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/SortCommand.java @@ -20,8 +20,8 @@ import at.pcgamingfreaks.Bukkit.Message.Message; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.InventoryCompressor; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java index 44c3b4f..04e927d 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/UpdateCommand.java @@ -17,13 +17,11 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; -import at.pcgamingfreaks.Bukkit.MCVersion; import at.pcgamingfreaks.Bukkit.Message.Message; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java index cb48570..3e1d658 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/VersionCommand.java @@ -17,7 +17,7 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommand; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks; import at.pcgamingfreaks.Minepacks.Bukkit.Permissions; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MinepacksPlayerData.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MinepacksPlayerData.java index 85fbf87..667173f 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MinepacksPlayerData.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/MinepacksPlayerData.java @@ -19,7 +19,7 @@ import at.pcgamingfreaks.Bukkit.Message.IMessage; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlayer; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksPlayerExtended; import at.pcgamingfreaks.Minepacks.Bukkit.Item.ItemConfig; import at.pcgamingfreaks.UUIDConverter; @@ -36,7 +36,7 @@ import java.util.UUID; -public abstract class MinepacksPlayerData implements MinepacksPlayer +public abstract class MinepacksPlayerData implements MinepacksPlayerExtended { @Getter @Setter private @NotNull String name; private final @NotNull UUID uuid; diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java index 95d5c63..48fd566 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java @@ -24,8 +24,6 @@ import at.pcgamingfreaks.ConsoleColor; import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack; import at.pcgamingfreaks.Minepacks.Bukkit.API.Callback; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager; -import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin; import at.pcgamingfreaks.Minepacks.Bukkit.Command.CommandManager; import at.pcgamingfreaks.Minepacks.Bukkit.Command.InventoryClearCommand; import at.pcgamingfreaks.Minepacks.Bukkit.Command.ShortcutCommand; @@ -34,6 +32,8 @@ import at.pcgamingfreaks.Minepacks.Bukkit.Database.Database; import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.WorldBlacklistMode; import at.pcgamingfreaks.Minepacks.Bukkit.Database.Language; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksCommandManager; +import at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI.MinepacksPluginExtended; import at.pcgamingfreaks.Minepacks.Bukkit.Listener.*; import at.pcgamingfreaks.Minepacks.Bukkit.SpecialInfoWorker.NoDatabaseWorker; import at.pcgamingfreaks.StringUtils; @@ -59,7 +59,7 @@ import java.util.Locale; import java.util.Set; -public class Minepacks extends JavaPlugin implements MinepacksPlugin +public class Minepacks extends JavaPlugin implements MinepacksPluginExtended { @Getter private static Minepacks instance = null; diff --git a/pom.xml b/pom.xml index a196bec..ad55b92 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ 3.0-ALPHA-SNAPSHOT UTF-8 UTF-8 + 1.0.30-SNAPSHOT @@ -72,6 +73,7 @@ + src clean package @@ -102,6 +104,7 @@ flatten-maven-plugin 1.2.1 + target/.flattened-pom.xml true @@ -139,6 +142,7 @@ Minepacks-API + Minepacks-API-Extended Minepacks