diff --git a/paper-api/pom.xml b/paper-api/pom.xml index 46af3f170d..7b9c6a5f96 100644 --- a/paper-api/pom.xml +++ b/paper-api/pom.xml @@ -72,12 +72,6 @@ 2.2.4 compile - - org.avaje - ebean - 2.8.1 - compile - org.yaml snakeyaml diff --git a/paper-api/src/main/java/org/bukkit/Bukkit.java b/paper-api/src/main/java/org/bukkit/Bukkit.java index cadbbcad00..75b0a9a4b2 100644 --- a/paper-api/src/main/java/org/bukkit/Bukkit.java +++ b/paper-api/src/main/java/org/bukkit/Bukkit.java @@ -40,7 +40,6 @@ import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.util.CachedServerIcon; -import com.avaje.ebean.config.ServerConfig; import com.google.common.collect.ImmutableList; import org.bukkit.generator.ChunkGenerator; @@ -589,16 +588,6 @@ public final class Bukkit { return server.dispatchCommand(sender, commandLine); } - /** - * Populates a given {@link ServerConfig} with values attributes to this - * server. - * - * @param config the server config to populate - */ - public static void configureDbConfig(ServerConfig config) { - server.configureDbConfig(config); - } - /** * Adds a recipe to the crafting manager. * diff --git a/paper-api/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java index 4c03a9971a..9468c4a678 100644 --- a/paper-api/src/main/java/org/bukkit/Server.java +++ b/paper-api/src/main/java/org/bukkit/Server.java @@ -41,7 +41,6 @@ import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.util.CachedServerIcon; -import com.avaje.ebean.config.ServerConfig; import com.google.common.collect.ImmutableList; import org.bukkit.generator.ChunkGenerator; @@ -485,14 +484,6 @@ public interface Server extends PluginMessageRecipient { */ public boolean dispatchCommand(CommandSender sender, String commandLine) throws CommandException; - /** - * Populates a given {@link ServerConfig} with values attributes to this - * server. - * - * @param config the server config to populate - */ - public void configureDbConfig(ServerConfig config); - /** * Adds a recipe to the crafting manager. * diff --git a/paper-api/src/main/java/org/bukkit/plugin/Plugin.java b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java index 4357b13110..c4e22c6228 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/Plugin.java +++ b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java @@ -9,8 +9,6 @@ import org.bukkit.command.TabExecutor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.generator.ChunkGenerator; -import com.avaje.ebean.EbeanServer; - /** * Represents a Plugin *

@@ -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 authors = null; private String website = null; private String prefix = null; - private boolean database = false; private PluginLoadOrder order = PluginLoadOrder.POSTWORLD; private List permissions = null; private Map lazyPermissions = null; @@ -427,25 +426,6 @@ public final class PluginDescriptionFile { return website; } - /** - * Gives if the plugin uses a database. - *

- *

- * In the plugin.yml, this entry is named database. - *

- * Example: - *

database: false
- * - * @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. *