From c06c0894293c97e0e405f07b679acd583bd273ed Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 30 May 2021 08:53:59 -0700
Subject: [PATCH] Register with BentoBox as an Addon

---
 pom.xml                                       |  2 +-
 .../bentobox/bskyblock/CopyToBentoBox.java    | 36 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfc209d..45fa702 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.16.1-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.16.1</bentobox.version>
+        <bentobox.version>1.16.3-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
diff --git a/src/main/java/world/bentobox/bskyblock/CopyToBentoBox.java b/src/main/java/world/bentobox/bskyblock/CopyToBentoBox.java
index a18683f..fb4ade5 100644
--- a/src/main/java/world/bentobox/bskyblock/CopyToBentoBox.java
+++ b/src/main/java/world/bentobox/bskyblock/CopyToBentoBox.java
@@ -1,44 +1,14 @@
 package world.bentobox.bskyblock;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.google.common.io.Files;
+import world.bentobox.bentobox.BentoBox;
 
-import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
-
-public class CopyToBentoBox extends JavaPlugin implements Listener {
+public class CopyToBentoBox extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        Bukkit.getPluginManager().registerEvents(this, this);
-    }
-
-    @EventHandler
-    public void onBentoBoxReady(BentoBoxReadyEvent e) {
-        getLogger().severe("BSkyBlock.jar must be in the BentoBox/addons folder! Trying to move it there...");
-        File addons = new File(getFile().getParent(), "BentoBox/addons");
-        if (addons.exists()) {
-            File to = new File(addons, getFile().getName());
-            if (!to.exists()) {
-
-                try {
-                    Files.move(getFile(), to);
-                    getLogger().severe(getFile().getName() + " moved successfully. Restart server now to activate!");
-
-                } catch (IOException ex) {
-                    getLogger().severe("Failed to move it. " + ex.getMessage());
-                    getLogger().severe("Move " + getFile().getName() + " manually into the BentoBox/addons folder. Then restart server.");
-                }
-            }
-        } else {
-            getLogger().severe("BentoBox folders do not exist! " + addons.getAbsolutePath());
-        }
+        BentoBox.getInstance().getAddonsManager().registerAddon(this, new BSkyBlock());
 
     }
 }