@@ -139,27 +137,6 @@ public interface Plugin extends TabExecutor { */ public void setNaggable(boolean canNag); - /** - * Gets the {@link EbeanServer} tied to this plugin. This will only be - * available if enabled in the {@link - * PluginDescriptionFile#isDatabaseEnabled()} - *
- * For more information on the use of - * Avaje Ebeans ORM, see Avaje Ebeans - * Documentation - *
- * For an example using Ebeans ORM, see Bukkit's Homebukkit Plugin
- *
- *
- * @return ebean server instance or null if not enabled
- * @deprecated all EBean related methods will be removed with Minecraft 1.12
- * - see https://www.spigotmc.org/threads/194144/
- */
- @Deprecated
- public EbeanServer getDatabase();
-
/**
* Gets a {@link ChunkGenerator} for use in a default world, as specified
* in the server configuration
diff --git a/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
index b93569f3dd..afd2012366 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
@@ -221,7 +221,6 @@ public final class PluginDescriptionFile {
private List
- * In the plugin.yml, this entry is named
- * Example:
- *
- *
- * true
and false
- * database
.
- *
- *
- * @return if this plugin requires a database
- * @see Plugin#getDatabase()
- */
- public boolean isDatabaseEnabled() {
- return database;
- }
-
/**
* Gives a list of other plugins that the plugin requires.
* database: false
@@ -873,10 +853,6 @@ public final class PluginDescriptionFile {
return classLoaderOf;
}
- public void setDatabaseEnabled(boolean database) {
- this.database = database;
- }
-
/**
* Saves this PluginDescriptionFile to the given writer
*
@@ -956,14 +932,6 @@ public final class PluginDescriptionFile {
softDepend = makePluginNameList(map, "softdepend");
loadBefore = makePluginNameList(map, "loadbefore");
- if (map.get("database") != null) {
- try {
- database = (Boolean) map.get("database");
- } catch (ClassCastException ex) {
- throw new InvalidDescriptionException(ex, "database is of wrong type");
- }
- }
-
if (map.get("website") != null) {
website = map.get("website").toString();
}
@@ -1061,7 +1029,6 @@ public final class PluginDescriptionFile {
map.put("name", name);
map.put("main", main);
map.put("version", version);
- map.put("database", database);
map.put("order", order.toString());
map.put("default-permission", defaultPerm.toString());
diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index bcb8a67997..16b1eb3728 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -32,12 +32,6 @@ import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.PluginLogger;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.DataSourceConfig;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.ddl.DdlGenerator;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
@@ -54,7 +48,6 @@ public abstract class JavaPlugin extends PluginBase {
private File dataFolder = null;
private ClassLoader classLoader = null;
private boolean naggable = true;
- private EbeanServer ebean = null;
private FileConfiguration newConfig = null;
private File configFile = null;
private PluginLogger logger = null;
@@ -285,42 +278,6 @@ public abstract class JavaPlugin extends PluginBase {
this.classLoader = classLoader;
this.configFile = new File(dataFolder, "config.yml");
this.logger = new PluginLogger(this);
-
- if (description.isDatabaseEnabled()) {
- ServerConfig db = new ServerConfig();
-
- db.setDefaultServer(false);
- db.setRegister(false);
- db.setClasses(getDatabaseClasses());
- db.setName(description.getName());
- server.configureDbConfig(db);
-
- DataSourceConfig ds = db.getDataSourceConfig();
-
- ds.setUrl(replaceDatabaseString(ds.getUrl()));
- dataFolder.mkdirs();
-
- ClassLoader previous = Thread.currentThread().getContextClassLoader();
-
- Thread.currentThread().setContextClassLoader(classLoader);
- ebean = EbeanServerFactory.create(db);
- Thread.currentThread().setContextClassLoader(previous);
- }
- }
-
- /**
- * Provides a list of all classes that should be persisted in the database
- *
- * @return List of Classes that are Ebeans
- */
- public List