mirror of
https://github.com/GeorgH93/Minepacks.git
synced 2024-12-10 15:03:30 +01:00
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
This commit is contained in:
GeorgH93
parent
1230e24755
commit
f316bdd66e
68
Minepacks-API-Extended/pom.xml
Normal file
68
Minepacks-API-Extended/pom.xml
Normal file
@ -0,0 +1,68 @@
|
||||
<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>
|
||||
<artifactId>Minepacks-API-Extended</artifactId>
|
||||
<parent>
|
||||
<artifactId>Minepacks-Parent</artifactId>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
<version>${revision}</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Minepacks-API-Extended</name>
|
||||
<description>Extended API for the Bukkit/Spigot plugin Minepacks. The extended API is only available when the plugin is running in normal mode!</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<artifactId>Minepacks-API</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks.pcgf_pluginlib</groupId>
|
||||
<artifactId>pcgf_pluginlib-bukkit</artifactId>
|
||||
<version>${pcgfPluginLibVersion}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean install</defaultGoal>
|
||||
<plugins>
|
||||
<!-- Creates a jar with the sources (for maven repo) -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- Creates a jar with the javadoc (for maven repo) -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<doclint>none</doclint>
|
||||
<source>8</source>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@ -15,7 +15,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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;
|
||||
}
|
||||
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package at.pcgamingfreaks.Minepacks.Bukkit.API;
|
||||
package at.pcgamingfreaks.Minepacks.Bukkit.ExtendedAPI;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public interface MinepacksCommandManager
|
||||
{
|
||||
/**
|
||||
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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);
|
||||
}
|
||||
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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();
|
||||
}
|
||||
@ -14,18 +14,8 @@
|
||||
<name>Minepacks-API</name>
|
||||
<description>API for the Bukkit/Spigot plugin Minepacks.</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<artifactId>PluginLib</artifactId>
|
||||
<version>1.0.17-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean install</defaultGoal>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<plugins>
|
||||
<!-- Creates a jar with the sources (for maven repo) -->
|
||||
<plugin>
|
||||
|
||||
@ -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
|
||||
{
|
||||
/**
|
||||
|
||||
@ -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);
|
||||
}
|
||||
@ -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<Backpack> 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.
|
||||
*
|
||||
|
||||
@ -31,14 +31,15 @@
|
||||
<!-- Minepacks API -->
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<artifactId>Minepacks-API</artifactId>
|
||||
<artifactId>Minepacks-API-Extended</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<!-- PCGF Plugin Lib -->
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<artifactId>PluginLib</artifactId>
|
||||
<version>1.0.30-SNAPSHOT</version>
|
||||
<groupId>at.pcgamingfreaks.pcgf_pluginlib</groupId>
|
||||
<artifactId>pcgf_pluginlib-plugin-bukkit</artifactId>
|
||||
<version>${pcgfPluginLibVersion}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- BadRabbit -->
|
||||
<dependency>
|
||||
@ -56,7 +57,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean package test</defaultGoal>
|
||||
<defaultGoal>clean test package</defaultGoal>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<testSourceDirectory>test/src</testSourceDirectory>
|
||||
<resources>
|
||||
@ -96,6 +97,7 @@
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>at.pcgamingfreaks:Minepacks-API</include>
|
||||
<include>at.pcgamingfreaks:Minepacks-API-Extended</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
</configuration>
|
||||
@ -145,6 +147,13 @@
|
||||
<mainClass>${project.groupId}.${project.artifactId}Standalone.Bukkit.${project.artifactId}</mainClass>
|
||||
<releaseType>Standalone</releaseType>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>at.pcgamingfreaks</groupId>
|
||||
<artifactId>PluginLib</artifactId>
|
||||
<version>${pcgfPluginLibVersion}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Shades some required libs into the final jar -->
|
||||
@ -167,6 +176,7 @@
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>at.pcgamingfreaks:Minepacks-API</include>
|
||||
<include>at.pcgamingfreaks:Minepacks-API-Extended</include>
|
||||
<include>at.pcgamingfreaks:PluginLib</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
@ -174,9 +184,9 @@
|
||||
<filter>
|
||||
<artifact>at.pcgamingfreaks:PluginLib</artifact>
|
||||
<excludes>
|
||||
<exclude>at/pcgamingfreaks/Bukkit/Particles/**</exclude>
|
||||
<exclude>at/pcgamingfreaks/Bungee/**</exclude>
|
||||
<exclude>at/pcgamingfreaks/PluginLib/**</exclude>
|
||||
<exclude>at/pcgamingfreaks/Bukkit/Particles/**</exclude> <!-- This plugin does not spawn particles -->
|
||||
<exclude>at/pcgamingfreaks/Bungee/**</exclude><!-- This plugin does not run on BungeeCord -->
|
||||
<exclude>at/pcgamingfreaks/PluginLib/**</exclude><!-- The PluginLib is not needed in standalone mode -->
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
@ -196,12 +206,7 @@
|
||||
<pattern>at.pcgamingfreaks</pattern>
|
||||
<shadedPattern>at.pcgamingfreaks.MinepacksStandalone.libs.at.pcgamingfreaks</shadedPattern>
|
||||
<excludes>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.Events.**</exclude>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack</exclude>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.Callback</exclude>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin</exclude>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksCommandManager</exclude>
|
||||
<exclude>at.pcgamingfreaks.**.IMessage</exclude>
|
||||
<exclude>at.pcgamingfreaks.Minepacks.Bukkit.API.**</exclude>
|
||||
</excludes>
|
||||
</relocation>
|
||||
</relocations>
|
||||
@ -270,6 +275,7 @@
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>at.pcgamingfreaks:Minepacks-API</include>
|
||||
<include>at.pcgamingfreaks:Minepacks-API-Extended</include>
|
||||
<include>at.pcgamingfreaks:BadRabbit-Bukkit</include>
|
||||
<include>at.pcgamingfreaks:Minepacks</include>
|
||||
</includes>
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
4
pom.xml
4
pom.xml
@ -10,6 +10,7 @@
|
||||
<revision>3.0-ALPHA-SNAPSHOT</revision>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<pcgfPluginLibVersion>1.0.30-SNAPSHOT</pcgfPluginLibVersion>
|
||||
</properties>
|
||||
|
||||
<scm>
|
||||
@ -72,6 +73,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<defaultGoal>clean package</defaultGoal>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@ -102,6 +104,7 @@
|
||||
<artifactId>flatten-maven-plugin</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<configuration>
|
||||
<flattenedPomFilename>target/.flattened-pom.xml</flattenedPomFilename>
|
||||
<updatePomFile>true</updatePomFile>
|
||||
<pomElements>
|
||||
<description/>
|
||||
@ -139,6 +142,7 @@
|
||||
|
||||
<modules>
|
||||
<module>Minepacks-API</module>
|
||||
<module>Minepacks-API-Extended</module>
|
||||
<module>Minepacks</module>
|
||||
</modules>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user