From 2fdd505744a752680a679c008b622f0628d55c28 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 6 Dec 2020 11:23:12 -0800
Subject: [PATCH] Version 1.8.1. Updates to latest APIs.

Fixes https://github.com/BentoBoxWorld/Converter/issues/16
---
 .settings/.gitignore                                 |  2 ++
 pom.xml                                              |  8 ++++----
 .../bentobox/a2b/commands/AdminConvertCommand.java   | 12 +++++++-----
 src/main/resources/addon.yml                         |  3 ++-
 4 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 .settings/.gitignore

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..6cb3d6d
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.core.resources.prefs
+/org.eclipse.jdt.core.prefs
diff --git a/pom.xml b/pom.xml
index 1f52246..3888aa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,9 +59,9 @@
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.8.0</bentobox.version>
-        <bskyblock.version>1.8.0</bskyblock.version>
-        <warps.version>1.6.0</warps.version>
+        <bentobox.version>1.15.0</bentobox.version>
+        <bskyblock.version>1.14.3</bskyblock.version>
+        <warps.version>1.10.0</warps.version>
         <challenges.version>0.8.0-SNAPSHOT</challenges.version>
         <itemconverter.version>22fd6f5ee4</itemconverter.version>
         <!-- Revision variable removes warning about dynamic version -->
@@ -69,7 +69,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.8.0</build.version>
+        <build.version>1.8.1</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
diff --git a/src/main/java/world/bentobox/a2b/commands/AdminConvertCommand.java b/src/main/java/world/bentobox/a2b/commands/AdminConvertCommand.java
index a642d47..7a128cb 100644
--- a/src/main/java/world/bentobox/a2b/commands/AdminConvertCommand.java
+++ b/src/main/java/world/bentobox/a2b/commands/AdminConvertCommand.java
@@ -162,7 +162,9 @@ private void getConfigs(User user) throws InvalidConfigurationException {
         s.setIslandStartX(config.getInt("island.startx",0));
         s.setIslandStartZ(config.getInt("island.startz",0));
         s.setSeaHeight(config.getInt("island.sealevel") != 0 ? config.getInt("island.sealevel") - 1 : 0);
-        s.setIslandHeight(config.getInt("island.islandlevel"));
+        // ASkyBlock has its bedrock block center 5 below the island height
+        int height = Math.max(0, config.getInt("island.islandlevel") - 5);
+        s.setIslandHeight(height);
 
         Flags.PREVENT_TELEPORT_WHEN_FALLING.setSetting(getWorld(), config.getBoolean("general.allowfallingteleport", true));
         Flags.GEO_LIMIT_MOBS.setSetting(getWorld(), config.getBoolean("general.restrictwither", true));
@@ -205,8 +207,8 @@ private void getConfigs(User user) throws InvalidConfigurationException {
         Flags.LEVER.setSetting(getWorld(), config.getBoolean("protection.world.LEAVER_BUTTON"));
         Flags.BUTTON.setSetting(getWorld(), config.getBoolean("protection.world.LEAVER_BUTTON"));
         Flags.MILKING.setSetting(getWorld(), config.getBoolean("protection.world.MILKING"));
-        Flags.ANIMAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MOB_SPAWN"));
-        Flags.MONSTER_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MONSTER_SPAWN"));
+        Flags.ANIMAL_NATURAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MOB_SPAWN"));
+        Flags.MONSTER_NATURAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MONSTER_SPAWN"));
         Flags.JUKEBOX.setSetting(getWorld(), config.getBoolean("protection.world.MUSIC"));
         Flags.NOTE_BLOCK.setSetting(getWorld(), config.getBoolean("protection.world.MUSIC"));
         Flags.PLACE_BLOCKS.setSetting(getWorld(), config.getBoolean("protection.world.PLACE_BLOCKS"));
@@ -278,11 +280,11 @@ public boolean accept(File dir, String name) {
                     // New player
                     p.setUniqueId(uniqueId);
                     p.setPlayerName(player.getString("playerName"));
-                    names.saveObject(new Names(player.getString("playerName"), uuid));
+                    names.saveObjectAsync(new Names(player.getString("playerName"), uuid));
                 }
                 p.getDeaths().putIfAbsent(config.getString("general.worldName"), player.getInt("deaths"));
                 p.setLocale(player.getString("locale"));
-                handler.saveObject(p);
+                handler.saveObjectAsync(p);
                 count++;
                 if (count % 10 == 0) {
                     user.sendRawMessage("Saved " + (count++) + " players");
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index 3baa8bb..c5458fe 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -2,9 +2,10 @@ name: a2b
 main: world.bentobox.a2b.A2B
 version: ${version}
 metrics: true
+api-version: 1.15
 
 authors: tastybento
 
 depend: BSkyBlock
 
-softdepend: WelcomeWarps Challenges
+softdepend: Warps Challenges