twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-29 19:33:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.11

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-11-17 12:40:59 +11:00
parent 06e0085b98
commit f1fb3d9462
59 changed files with 646 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
View File

@@ -67,27 +67,6 @@ public abstract class JavaPlugin extends PluginBase {
((PluginClassLoader) classLoader).initialize(this);
}
/**
* @deprecated This method is intended for unit testing purposes when the
* other {@linkplain #JavaPlugin(JavaPluginLoader,
* PluginDescriptionFile, File, File) constructor} cannot be used.
* <p>
* Its existence may be temporary.
* @param loader the plugin loader
* @param server the server instance
* @param description the plugin's description
* @param dataFolder the plugin's data folder
* @param file the location of the plugin
*/
@Deprecated
protected JavaPlugin(final PluginLoader loader, final Server server, final PluginDescriptionFile description, final File dataFolder, final File file) {
final ClassLoader classLoader = this.getClass().getClassLoader();
if (classLoader instanceof PluginClassLoader) {
throw new IllegalStateException("Cannot use initialization constructor at runtime");
}
init(loader, server, description, dataFolder, file, classLoader);
}
protected JavaPlugin(final JavaPluginLoader loader, final PluginDescriptionFile description, final File dataFolder, final File file) {
final ClassLoader classLoader = this.getClass().getClassLoader();
if (classLoader instanceof PluginClassLoader) {
@@ -296,23 +275,6 @@ public abstract class JavaPlugin extends PluginBase {
}
}
/**
* @param loader the plugin loader
* @param server the server instance
* @param description the plugin's description
* @param dataFolder the plugin's data folder
* @param file the location of the plugin
* @param classLoader the class loader
* @deprecated This method is legacy and will be removed - it must be
* replaced by the specially provided constructor(s).
*/
@Deprecated
protected final void initialize(PluginLoader loader, Server server, PluginDescriptionFile description, File dataFolder, File file, ClassLoader classLoader) {
if (server.getWarningState() == WarningState.OFF) {
return;
}
getLogger().log(Level.WARNING, getClass().getName() + " is already initialized", server.getWarningState() == WarningState.DEFAULT ? null : new AuthorNagException("Explicit initialization"));
}
final void init(PluginLoader loader, Server server, PluginDescriptionFile description, File dataFolder, File file, ClassLoader classLoader) {
this.loader = loader;
@@ -361,18 +323,6 @@ public abstract class JavaPlugin extends PluginBase {
return input;
}
/**
* Gets the initialization status of this plugin
*
* @return true if this plugin is initialized, otherwise false
* @deprecated This method cannot return false, as {@link
* JavaPlugin} is now initialized in the constructor.
*/
@Deprecated
public final boolean isInitialized() {
return true;
}
/**
* {@inheritDoc}
*/