Update to BentoBox 1.2

For users who are not ready to use unfinished Challenges 0.5
BentoBoxWorld · Jan 28, 2019 · fbe7f15 · fbe7f15
1 parent 4c3026f
commit fbe7f15
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesAddon.java b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
@@ -41,27 +41,20 @@ public void onEnable() {
         // Challenge import setup
         importManager = new FreshSqueezedChallenges(this);
 
-        // Register commands - run one tick later to allow all addons to load
-        // AcidIsland hook in
-        getPlugin().getAddonsManager().getAddonByName("AcidIsland").ifPresent(a -> {
-            CompositeCommand acidIslandCmd = getPlugin().getCommandsManager().getCommand("ai");
-            if (acidIslandCmd != null) {
-                new ChallengesCommand(this, acidIslandCmd);
-                CompositeCommand acidCmd = getPlugin().getCommandsManager().getCommand("acid");
-                new Challenges(this, acidCmd);
-                hooked = true;
+        this.getPlugin().getAddonsManager().getGameModeAddons().forEach(gameModeAddon -> {
+            if (gameModeAddon.getPlayerCommand().isPresent())
+            {
+                new ChallengesCommand(this, gameModeAddon.getPlayerCommand().get());
+                this.hooked = true;
             }
-        });
-        getPlugin().getAddonsManager().getAddonByName("BSkyBlock").ifPresent(a -> {
-            // BSkyBlock hook in
-            CompositeCommand bsbIslandCmd = getPlugin().getCommandsManager().getCommand("island");
-            if (bsbIslandCmd != null) {
-                new ChallengesCommand(this, bsbIslandCmd);
-                CompositeCommand bsbAdminCmd = getPlugin().getCommandsManager().getCommand("bsbadmin");
-                new Challenges(this, bsbAdminCmd);
-                hooked = true;
+
+            if (gameModeAddon.getAdminCommand().isPresent())
+            {
+                new Challenges(this, gameModeAddon.getAdminCommand().get());
+                this.hooked = true;
             }
         });
+
         // If the add-on never hooks in, then it is useless
         if (!hooked) {
             logError("Challenges could not hook into AcidIsland or BSkyBlock so will not do anything!");