Migrate to PlAddon and BentoBox 1.20 API.

Added dependencies to Level, Warps and Visits addons. (not used currently)
BentoBoxWorld · Apr 30, 2022 · 5ad7e07 · 5ad7e07
1 parent 7e2e56d
commit 5ad7e07
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,19 +54,29 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>16</java.version>
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.2</powermock.version>
-        <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.17.1-SNAPSHOT</bentobox.version>
+        <!-- SPIGOT API version -->
+        <spigot.version>1.16.4-R0.1-SNAPSHOT</spigot.version>
+        <!-- Vault API version -->
+        <vault.version>1.7</vault.version>
+
+        <!-- BentoBox API version -->
+        <bentobox.version>1.20.0</bentobox.version>
+        <!-- Warps addon version -->
+        <warps.version>1.7.0</warps.version>
+        <!-- Visit addon version -->
+        <visit.version>1.5.0-SNAPSHOT</visit.version>
+        <!-- Level addon version -->
         <level.version>1.5.0</level.version>
+        <!-- Panel Utils version -->
+        <panelutils.version>1.0.0</panelutils.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
-        <!-- Do not change unless you want different name for local builds. -->
+        <!-- This allows to change between versions and snapshots. -->
+        <build.version>1.1.0</build.version>
         <build.number>-LOCAL</build.number>
-        <!-- This allows to change between versions. -->
-        <build.version>1.0.3</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
@@ -134,6 +144,12 @@
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>plugin-annotations</artifactId>
+            <version>1.2.3-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- Mockito (Unit testing) -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -159,6 +175,24 @@
             <version>${bentobox.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>level</artifactId>
+            <version>${level.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>visit</artifactId>
+            <version>${visit.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>warps</artifactId>
+            <version>${warps.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- Static analysis -->
         <!-- We are using Eclipse's annotations. If you're using IDEA, update 
             your project settings to take these into account for in real time static 

diff --git a/src/main/java/world/bentobox/checkmeout/CheckMeOut.java b/src/main/java/world/bentobox/checkmeout/CheckMeOut.java
@@ -12,6 +12,9 @@
 import world.bentobox.checkmeout.commands.CMOAdminCommand;
 import world.bentobox.checkmeout.commands.CheckMeOutCommand;
 import world.bentobox.checkmeout.config.Settings;
+import world.bentobox.checkmeout.managers.SubmissionPanelManager;
+import world.bentobox.checkmeout.managers.SubmissionsManager;
+
 
 /**
  * Addon to BentoBox that enables island submissions

diff --git a/src/main/java/world/bentobox/checkmeout/CheckMeOutPladdon.java b/src/main/java/world/bentobox/checkmeout/CheckMeOutPladdon.java
@@ -0,0 +1,24 @@
+package world.bentobox.checkmeout;
+
+import org.bukkit.plugin.java.annotation.dependency.Dependency;
+import org.bukkit.plugin.java.annotation.plugin.ApiVersion;
+import org.bukkit.plugin.java.annotation.plugin.Plugin;
+
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.Pladdon;
+
+
+/**
+ *
+ * @author BONNe
+ */
+@Plugin(name="Pladdon", version="1.0")
+@ApiVersion(ApiVersion.Target.v1_16)
+@Dependency(value = "BentoBox")
+public class CheckMeOutPladdon extends Pladdon {
+
+    @Override
+    public Addon getAddon() {
+        return new CheckMeOut();
+    }
+}
diff --git a/...ox/checkmeout/SubmissionPanelManager.java → ...eout/managers/SubmissionPanelManager.java b/...ox/checkmeout/SubmissionPanelManager.java → ...eout/managers/SubmissionPanelManager.java
@@ -1,4 +1,4 @@
-package world.bentobox.checkmeout;
+package world.bentobox.checkmeout.managers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +14,8 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.checkmeout.CheckMeOut;
+
 
 public class SubmissionPanelManager {
 

diff --git a/...ntobox/checkmeout/SubmissionsManager.java → ...eckmeout/managers/SubmissionsManager.java b/...ntobox/checkmeout/SubmissionsManager.java → ...eckmeout/managers/SubmissionsManager.java
@@ -1,4 +1,4 @@
-package world.bentobox.checkmeout;
+package world.bentobox.checkmeout.managers;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,6 +22,7 @@
 import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.bentobox.util.teleport.SafeSpotTeleport;
+import world.bentobox.checkmeout.CheckMeOut;
 import world.bentobox.checkmeout.objects.SubmissionData;
 
 /**