From 4cb6b66bc7a00ca35c34bf501118b2d5bca86bcf Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Wed, 10 Jun 2020 21:31:20 -0700
Subject: [PATCH] BentoBox 1.14 API

---
 pom.xml                                       |  2 +-
 .../bentobox/warps/SignCacheManager.java      |  8 ++---
 .../bentobox/warps/objects/SignCache.java     |  2 ++
 .../bentobox/warps/objects/WarpsData.java     |  2 ++
 src/main/resources/addon.yml                  | 33 ++-----------------
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index f409793..62ba0a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,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.9.7</build.version>
+        <build.version>1.9.8</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
diff --git a/src/main/java/world/bentobox/warps/SignCacheManager.java b/src/main/java/world/bentobox/warps/SignCacheManager.java
index d590604..8e971d2 100644
--- a/src/main/java/world/bentobox/warps/SignCacheManager.java
+++ b/src/main/java/world/bentobox/warps/SignCacheManager.java
@@ -17,7 +17,7 @@ public class SignCacheManager {
     private Warp addon;
     // Database handler for level data
     private Database<SignCache> handler;
-    
+
     public SignCacheManager(Warp addon) {
         this.addon = addon;
         handler = new Database<>(addon, SignCache.class);
@@ -33,9 +33,9 @@ public class SignCacheManager {
             }
         });
     }
-    
+
     void saveCache() {
-        cachedSigns.forEach((w, m) -> handler.saveObject(new SignCache(w, m)));
+        cachedSigns.forEach((w, m) -> handler.saveObjectAsync(new SignCache(w, m)));
     }
 
     Material getSignIcon(World world, UUID warpOwner) {
@@ -65,7 +65,7 @@ public class SignCacheManager {
         cachedSigns.get(world).put(playerUUID, result);
         return result.getSignText();
     }
-    
+
     /**
      * Removes sign text from the cache
      * @param world - world
diff --git a/src/main/java/world/bentobox/warps/objects/SignCache.java b/src/main/java/world/bentobox/warps/objects/SignCache.java
index 042a1b2..8f8e3e6 100644
--- a/src/main/java/world/bentobox/warps/objects/SignCache.java
+++ b/src/main/java/world/bentobox/warps/objects/SignCache.java
@@ -9,8 +9,10 @@ import org.bukkit.World;
 import com.google.gson.annotations.Expose;
 
 import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.Table;
 import world.bentobox.warps.SignCacheItem;
 
+@Table(name = "WarpSignCache")
 public class SignCache implements DataObject {
 
     @Expose
diff --git a/src/main/java/world/bentobox/warps/objects/WarpsData.java b/src/main/java/world/bentobox/warps/objects/WarpsData.java
index ad4a1f3..db85455 100644
--- a/src/main/java/world/bentobox/warps/objects/WarpsData.java
+++ b/src/main/java/world/bentobox/warps/objects/WarpsData.java
@@ -10,7 +10,9 @@ import org.bukkit.World;
 import com.google.gson.annotations.Expose;
 
 import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.Table;
 
+@Table(name = "WarpsData")
 public class WarpsData implements DataObject {
 
     @Expose
diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index 7a54650..4e346a4 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -2,43 +2,16 @@ name: Warps
 main: world.bentobox.warps.Warp
 version: ${version}${build.number}
 icon: OAK_SIGN
+api-version: 1.14
 
 authors: tastybento
 
 softdepend: AcidIsland, BSkyBlock, CaveBlock, SkyGrid, AOneBlock
 
 permissions:
-  bskyblock.island.warp:
+  '[gamemode].island.warp':
     description: Player can use warp or warps commands
     default: true
-  bskyblock.island.addwarp:
-    description: Player can create a welcome warp sign
-    default: true
-
-  acidisland.island.warp:
-    description: Player can use warp or warps commands
-    default: true
-  acidisland.island.addwarp:
-    description: Player can create a welcome warp sign
-    default: true
-
-  caveblock.island.warp:
-    description: Player can use warp or warps commands
-    default: true
-  caveblock.island.addwarp:
-    description: Player can create a welcome warp sign
-    default: true
-
-  skygrid.island.warp:
-    description: Player can use warp or warps commands
-    default: true
-  skygrid.island.addwarp:
-    description: Player can create a welcome warp sign
-    default: true
-
-  aoneblock.island.warp:
-    description: Player can use warp or warps commands
-    default: true
-  aoneblock.island.addwarp:
+  '[gamemode].island.addwarp':
     description: Player can create a welcome warp sign
     default: true