From 8dce42490aef82768ff3ed634c2986bec0dbd16a Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 6 Aug 2018 07:45:45 -0700 Subject: [PATCH] Using Config and Database API naming --- src/main/java/bentobox/addon/warps/WarpSignsManager.java | 6 +++--- .../java/bentobox/addon/warps/WarpPanelManagerTest.java | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/bentobox/addon/warps/WarpSignsManager.java b/src/main/java/bentobox/addon/warps/WarpSignsManager.java index b2dc2ee..b10c3a2 100644 --- a/src/main/java/bentobox/addon/warps/WarpSignsManager.java +++ b/src/main/java/bentobox/addon/warps/WarpSignsManager.java @@ -29,7 +29,7 @@ import bentobox.addon.warps.event.WarpInitiateEvent; import bentobox.addon.warps.event.WarpListEvent; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.BBDatabase; +import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.util.Util; @@ -45,7 +45,7 @@ public class WarpSignsManager { // Map of all warps stored as player, warp sign Location private Map> worldsWarpList; // Database handler for level data - private BBDatabase handler; + private Database handler; private Warp addon; @@ -68,7 +68,7 @@ public class WarpSignsManager { this.plugin = plugin; // Set up the database handler to store and retrieve Island classes // Note that these are saved by the BSkyBlock database - handler = new BBDatabase<>(addon, WarpsData.class); + handler = new Database<>(addon, WarpsData.class); // Load the warps loadWarpList(); } diff --git a/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java b/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java index 0199f5c..8fb1ae6 100644 --- a/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java +++ b/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java @@ -27,9 +27,6 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import bentobox.addon.warps.Warp; -import bentobox.addon.warps.WarpPanelManager; -import bentobox.addon.warps.WarpSignsManager; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.PlayersManager;