From 2d25850b3a0532cbc3483d796e2c4d6e23fafa13 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 29 Jul 2018 17:21:41 -0700
Subject: [PATCH] Update to new API

---
 .../addon/challenges/ChallengesAddon.java        | 16 ++++++++--------
 .../addon/challenges/ChallengesManager.java      |  2 +-
 .../commands/admin/CreateSurrounding.java        |  2 +-
 .../addon/challenges/panel/ChallengesPanels.java |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
index b937286..da914a1 100644
--- a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
+++ b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java
@@ -21,7 +21,7 @@ public class ChallengesAddon extends Addon {
     @Override
     public void onEnable() {
         // Check if it is enabled - it might be loaded, but not enabled.
-        if (getBSkyBlock() == null || !getBSkyBlock().isEnabled()) {
+        if (getPlugin() == null || !getPlugin().isEnabled()) {
             Bukkit.getLogger().severe("BSkyBlock is not available or disabled!");
             this.setEnabled(false);
             return;
@@ -34,21 +34,21 @@ public class ChallengesAddon extends Addon {
 
         // Register commands - run one tick later to allow all addons to load
         // AcidIsland hook in
-        getServer().getScheduler().runTask(getBSkyBlock(), () -> {
-            this.getBSkyBlock().getAddonsManager().getAddonByName("AcidIsland").ifPresent(a -> {
-                CompositeCommand acidIslandCmd = getBSkyBlock().getCommandsManager().getCommand("ai");
+        getServer().getScheduler().runTask(getPlugin(), () -> {
+            this.getPlugin().getAddonsManager().getAddonByName("AcidIsland").ifPresent(a -> {
+                CompositeCommand acidIslandCmd = getPlugin().getCommandsManager().getCommand("ai");
                 if (acidIslandCmd != null) {
                     new ChallengesCommand(this, acidIslandCmd);
-                    CompositeCommand acidCmd = getBSkyBlock().getCommandsManager().getCommand("acid");
+                    CompositeCommand acidCmd = getPlugin().getCommandsManager().getCommand("acid");
                     new ChallengesAdminImportCommand(this, acidCmd);
                 }
             });
-            this.getBSkyBlock().getAddonsManager().getAddonByName("BSkyBlock").ifPresent(a -> {
+            this.getPlugin().getAddonsManager().getAddonByName("BSkyBlock").ifPresent(a -> {
                 // BSkyBlock hook in
-                CompositeCommand bsbIslandCmd = getBSkyBlock().getCommandsManager().getCommand("island");
+                CompositeCommand bsbIslandCmd = getPlugin().getCommandsManager().getCommand("island");
                 if (bsbIslandCmd != null) {
                     new ChallengesCommand(this, bsbIslandCmd);
-                    CompositeCommand bsbAdminCmd = getBSkyBlock().getCommandsManager().getCommand("bsbadmin");
+                    CompositeCommand bsbAdminCmd = getPlugin().getCommandsManager().getCommand("bsbadmin");
                     new ChallengesAdminImportCommand(this, bsbAdminCmd);
                 }
             });
diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
index d4c60cd..e240975 100644
--- a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
+++ b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java
@@ -356,7 +356,7 @@ public class ChallengesManager {
      */
     public void save(boolean async) {
         if (async) {
-            addon.getServer().getScheduler().runTaskAsynchronously(addon.getBSkyBlock(), this::save);
+            addon.getServer().getScheduler().runTaskAsynchronously(addon.getPlugin(), this::save);
         } else {
             save();
         }
diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
index 4e95c33..ebbc756 100644
--- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
+++ b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java
@@ -39,7 +39,7 @@ public class CreateSurrounding extends CompositeCommand implements Listener {
     public CreateSurrounding(ChallengesAddon addon, CompositeCommand parent) {
         super(parent, "surrounding");
         this.addon = addon;
-        addon.getServer().getPluginManager().registerEvents(this, addon.getBSkyBlock());
+        addon.getServer().getPluginManager().registerEvents(this, addon.getPlugin());
     }
 
     @Override
diff --git a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
index c2f93fd..d8d5866 100644
--- a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
+++ b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java
@@ -218,7 +218,7 @@ public class ChallengesPanels {
         if (expReward > 0) {
             result.addAll(splitTrans(user,"challenges.exp-reward", "[reward]", String.valueOf(expReward)));
         }
-        if (addon.getBSkyBlock().getSettings().isUseEconomy() && moneyReward > 0) {
+        if (addon.getPlugin().getSettings().isUseEconomy() && moneyReward > 0) {
             result.addAll(splitTrans(user,"challenges.money-reward", "[reward]", String.valueOf(moneyReward)));
         }
         // Final placeholder change for [label]