Use BentoBox 1.5.0 API

BentoBoxWorld · May 15, 2019 · 5c8df6e · 5c8df6e
1 parent 7715474
commit 5c8df6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
 		<dependency>
 			<groupId>world.bentobox</groupId>
 			<artifactId>bentobox</artifactId>
-			<version>1.4.0</version>
+			<version>1.5.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Vault -->

diff --git a/src/main/java/world/bentobox/skygrid/Settings.java b/src/main/java/world/bentobox/skygrid/Settings.java
@@ -17,7 +17,6 @@
 import world.bentobox.bentobox.api.configuration.StoreAt;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.bentobox.database.objects.adapters.Adapter;
 import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
 import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
@@ -29,7 +28,7 @@
 @StoreAt(filename="config.yml", path="addons/SkyGrid") // Explicitly call out what name this should have.
 @ConfigComment("SkyGrid Configuration [version]")
 @ConfigComment("")
-public class Settings implements DataObject, WorldSettings {
+public class Settings implements WorldSettings {
 
     /* Commands */
     @ConfigComment("Island Command. What command users will run to access their island.")

diff --git a/src/main/java/world/bentobox/skygrid/commands/ResetCommand.java b/src/main/java/world/bentobox/skygrid/commands/ResetCommand.java
@@ -6,6 +6,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
@@ -92,7 +93,7 @@ private boolean resetIsland(User user) {
         try {
             NewIsland.builder()
             .player(user)
-            .world(getWorld())
+            .addon((GameModeAddon) getAddon())
             .reason(Reason.RESET)
             .noPaste()
             .build();

diff --git a/src/main/java/world/bentobox/skygrid/commands/SkyGridCommand.java b/src/main/java/world/bentobox/skygrid/commands/SkyGridCommand.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.island.IslandBanCommand;
 import world.bentobox.bentobox.api.commands.island.IslandBanlistCommand;
@@ -74,7 +75,7 @@ public boolean execute(User user, String label, List<String> args) {
             try {
                 NewIsland.builder()
                 .player(user)
-                .world(getWorld())
+                .addon((GameModeAddon) getAddon())
                 .reason(Reason.CREATE)
                 .noPaste()
                 .build();