From 8093bbbf6cdd3bd37918293ffc0c6a78123da3ae Mon Sep 17 00:00:00 2001
From: BONNe1704 <bonne@bonne.id.lv>
Date: Thu, 9 May 2019 12:25:43 +0300
Subject: [PATCH 1/2] Upgrade to BentoBox 1.5.0-SNAPSHOT changes.

Remove DataObject from Settings class.
---
 pom.xml                                       |  4 +--
 .../world/bentobox/caveblock/Settings.java    | 27 +------------------
 src/main/resources/config.yml                 |  3 ---
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e8058b..2c7b2ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,11 @@
 		<java.version>1.8</java.version>
 		<!-- More visible way how to change dependency versions -->
 		<spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
-		<bentobox.version>1.5.0</bentobox.version>
+		<bentobox.version>1.5.0-SNAPSHOT</bentobox.version>
 		<!-- Revision variable removes warning about dynamic version -->
 		<revision>${build.version}-SNAPSHOT</revision>
 		<!-- This allows to change between versions and snapshots. -->
-		<build.version>1.4.1</build.version>
+		<build.version>1.5.0</build.version>
 		<build.number>-LOCAL</build.number>
 	</properties>
 
diff --git a/src/main/java/world/bentobox/caveblock/Settings.java b/src/main/java/world/bentobox/caveblock/Settings.java
index 3a2e6ba..c225cb7 100644
--- a/src/main/java/world/bentobox/caveblock/Settings.java
+++ b/src/main/java/world/bentobox/caveblock/Settings.java
@@ -31,26 +31,13 @@ import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
  */
 @StoreAt(filename="config.yml", path="addons/CaveBlock")
 @ConfigComment("CaveBlock Configuration [version]")
-@ConfigComment("This config file is dynamic and saved when the server is shutdown.")
-@ConfigComment("If you edit it while the server is running use /cbadmin reload")
-@ConfigComment("otherwise your settings will be lost.")
-public class Settings implements DataObject, WorldSettings
+public class Settings implements WorldSettings
 {
     // ---------------------------------------------------------------------
     // Section: Getters
     // ---------------------------------------------------------------------
 
 
-    /**
-     * @return the uniqueId
-     */
-    @Override
-    public String getUniqueId()
-    {
-        return this.uniqueId;
-    }
-
-
     /**
      * This method returns the friendlyName object.
      * @return the friendlyName object.
@@ -793,16 +780,6 @@ public class Settings implements DataObject, WorldSettings
     // ---------------------------------------------------------------------
 
 
-    /**
-     * @param uniqueId - unique ID the uniqueId to set
-     */
-    @Override
-    public void setUniqueId(String uniqueId)
-    {
-        this.uniqueId = uniqueId;
-    }
-
-
     /**
      * This method sets the friendlyName object value.
      * @param friendlyName the friendlyName object new value.
@@ -1900,6 +1877,4 @@ public class Settings implements DataObject, WorldSettings
     @ConfigEntry(path = "do-not-edit-these-settings.reset-epoch")
     private long resetEpoch = 0;
     private boolean debug;
-
-    private String uniqueId = "config";
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 597e3ab..bcaa106 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,7 +1,4 @@
 # CaveBlock Configuration ${version}
-# This config file is dynamic and saved when the server is shutdown.
-# If you edit it while the server is running use /cbadmin reload
-# otherwise your settings will be lost.
 caveblock:
   command:
     # Cave Command. What command users will run to access their cave.

From f39ed36854a651c625322bd8e670361d78759e10 Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@bentobox.world>
Date: Mon, 13 May 2019 10:51:14 +0200
Subject: [PATCH 2/2] Added a few attributes to addon.yml

---
 src/main/resources/addon.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index c1658e6..3718e39 100644
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -1,6 +1,9 @@
 name: CaveBlock
 main: world.bentobox.caveblock.CaveBlock
 version: ${version}${build.number}
+metrics: true
+repository: "BentoBoxWorld/CaveBlock"
+icon: "STONE_PICKAXE"
 
 authors: BONNe
 
@@ -136,4 +139,4 @@ permissions:
     default: op
   caveblock.skywalker:
     description: Allows player to walk over the heigh limit.
-    default: op
\ No newline at end of file
+    default: op