diff --git a/addon.yml b/addon.yml index 0883625..57766e5 100755 --- a/addon.yml +++ b/addon.yml @@ -1,5 +1,5 @@ -name: BSkyBlock-Challenges -main: bskyblock.addon.challenges.ChallengesAddon +name: BentoBox-Challenges +main: bentobox.addon.challenges.ChallengesAddon version: 0.1 authors: tastybento diff --git a/locales/en-US.yml b/locales/en-US.yml index 54502ff..a0ddcca 100755 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -36,7 +36,7 @@ challenges: challange-completed: "Challenge: [challengename] has been completed for [name]" error: could-not-save: "&cCould not save the challenge!" - island-level: "&cYour island must be level [level] to complete this challenge!" + island-level: "&cYour island must be level [number] to complete this challenge!" items-not-there: "&cAll required items must be close to you on your island!" no-items-clicked: "&cYou did not click on anything. Cancelling." not-close-enough: "&cYou must be standing within [number] blocks of all required items." diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java b/src/main/java/bentobox/addon/challenges/ChallengesAddon.java similarity index 90% rename from src/main/java/bskyblock/addon/challenges/ChallengesAddon.java rename to src/main/java/bentobox/addon/challenges/ChallengesAddon.java index c584e58..84c718e 100644 --- a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java +++ b/src/main/java/bentobox/addon/challenges/ChallengesAddon.java @@ -1,9 +1,9 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import org.bukkit.Bukkit; -import bskyblock.addon.challenges.commands.ChallengesCommand; -import bskyblock.addon.challenges.commands.admin.ChallengesAdminImportCommand; +import bentobox.addon.challenges.commands.ChallengesCommand; +import bentobox.addon.challenges.commands.admin.ChallengesAdminImportCommand; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.commands.CompositeCommand; @@ -22,7 +22,7 @@ public class ChallengesAddon extends Addon { public void onEnable() { // Check if it is enabled - it might be loaded, but not enabled. if (getPlugin() == null || !getPlugin().isEnabled()) { - Bukkit.getLogger().severe("BSkyBlock is not available or disabled!"); + Bukkit.getLogger().severe("BentoBox is not available or disabled!"); this.setEnabled(false); return; } diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java b/src/main/java/bentobox/addon/challenges/ChallengesManager.java similarity index 97% rename from src/main/java/bskyblock/addon/challenges/ChallengesManager.java rename to src/main/java/bentobox/addon/challenges/ChallengesManager.java index 8cdc6e6..faee3d9 100644 --- a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java +++ b/src/main/java/bentobox/addon/challenges/ChallengesManager.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import java.util.ArrayList; import java.util.Arrays; @@ -20,12 +20,12 @@ import org.bukkit.World; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.commands.admin.SurroundChallengeBuilder; -import bskyblock.addon.challenges.database.object.ChallengeLevels; -import bskyblock.addon.challenges.database.object.Challenges; -import bskyblock.addon.challenges.database.object.Challenges.ChallengeType; -import bskyblock.addon.challenges.database.object.PlayerData; -import bskyblock.addon.challenges.panel.ChallengesPanels; +import bentobox.addon.challenges.commands.admin.SurroundChallengeBuilder; +import bentobox.addon.challenges.database.object.ChallengeLevels; +import bentobox.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.database.object.PlayerData; +import bentobox.addon.challenges.database.object.Challenges.ChallengeType; +import bentobox.addon.challenges.panel.ChallengesPanels; import world.bentobox.bentobox.api.configuration.BSBConfig; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.BSBDatabase; diff --git a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java b/src/main/java/bentobox/addon/challenges/FreshSqueezedChallenges.java similarity index 98% rename from src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java rename to src/main/java/bentobox/addon/challenges/FreshSqueezedChallenges.java index 4aa3309..374b205 100644 --- a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java +++ b/src/main/java/bentobox/addon/challenges/FreshSqueezedChallenges.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import java.io.File; import java.io.IOException; @@ -16,8 +16,8 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.database.object.ChallengeLevels; -import bskyblock.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.database.object.ChallengeLevels; +import bentobox.addon.challenges.database.object.Challenges; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; diff --git a/src/main/java/bskyblock/addon/challenges/LevelStatus.java b/src/main/java/bentobox/addon/challenges/LevelStatus.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/LevelStatus.java rename to src/main/java/bentobox/addon/challenges/LevelStatus.java index 9dffe03..8a178c0 100644 --- a/src/main/java/bskyblock/addon/challenges/LevelStatus.java +++ b/src/main/java/bentobox/addon/challenges/LevelStatus.java @@ -1,6 +1,6 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; -import bskyblock.addon.challenges.database.object.ChallengeLevels; +import bentobox.addon.challenges.database.object.ChallengeLevels; /** * Level status class diff --git a/src/main/java/bskyblock/addon/challenges/ParseItem.java b/src/main/java/bentobox/addon/challenges/ParseItem.java similarity index 99% rename from src/main/java/bskyblock/addon/challenges/ParseItem.java rename to src/main/java/bentobox/addon/challenges/ParseItem.java index 46b98e3..9160624 100644 --- a/src/main/java/bskyblock/addon/challenges/ParseItem.java +++ b/src/main/java/bentobox/addon/challenges/ParseItem.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java b/src/main/java/bentobox/addon/challenges/commands/ChallengesCommand.java similarity index 87% rename from src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java rename to src/main/java/bentobox/addon/challenges/commands/ChallengesCommand.java index c7bcbf9..b815f50 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java +++ b/src/main/java/bentobox/addon/challenges/commands/ChallengesCommand.java @@ -1,9 +1,9 @@ -package bskyblock.addon.challenges.commands; +package bentobox.addon.challenges.commands; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; -import bskyblock.addon.challenges.panel.ChallengesPanels; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.panel.ChallengesPanels; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java b/src/main/java/bentobox/addon/challenges/commands/admin/ChallengesAdminImportCommand.java similarity index 92% rename from src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java rename to src/main/java/bentobox/addon/challenges/commands/admin/ChallengesAdminImportCommand.java index 22c9c1a..7d92472 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/ChallengesAdminImportCommand.java @@ -1,10 +1,10 @@ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.Arrays; import java.util.List; import java.util.Optional; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java b/src/main/java/bentobox/addon/challenges/commands/admin/CreateChallenge.java similarity index 88% rename from src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java rename to src/main/java/bentobox/addon/challenges/commands/admin/CreateChallenge.java index b7a52a3..38d16a8 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/CreateChallenge.java @@ -1,9 +1,9 @@ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; -import bskyblock.addon.challenges.panel.CreateChallengeListener; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.panel.CreateChallengeListener; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java b/src/main/java/bentobox/addon/challenges/commands/admin/CreateSurrounding.java similarity index 97% rename from src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java rename to src/main/java/bentobox/addon/challenges/commands/admin/CreateSurrounding.java index 2bafb40..c1b709d 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/CreateSurrounding.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.HashMap; import java.util.List; @@ -16,7 +16,7 @@ import org.bukkit.event.player.PlayerInteractAtEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java b/src/main/java/bentobox/addon/challenges/commands/admin/MakeLevel.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java rename to src/main/java/bentobox/addon/challenges/commands/admin/MakeLevel.java index 99a74da..5712ff5 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/MakeLevel.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetDeployed.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetDeployed.java index 9b8ffe9..45f18b6 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetDeployed.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetDescription.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetDescription.java index 3d92c69..a99f2ee 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetDescription.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetExp.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetExp.java index 887ab9c..cf25273 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetExp.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetFriendlyName.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetFriendlyName.java index f687548..3a6fa3d 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetFriendlyName.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetIcon.java similarity index 90% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetIcon.java index cd8d009..82786b2 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetIcon.java @@ -1,14 +1,14 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.ChallengesAddon; -import bskyblock.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.database.object.Challenges; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetLevel.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetLevel.java index da2ba40..8b496b5 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetLevel.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetMaxTimes.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetMaxTimes.java index 39cab09..367ae3b 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetMaxTimes.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetPerm.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetPerm.java index 158ba1f..737bc86 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetPerm.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetRepeatable.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetRepeatable.java index f2d624f..c7875f3 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetRepeatable.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetReward.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetReward.java index 7f3c2ea..d8d0808 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetReward.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java b/src/main/java/bentobox/addon/challenges/commands/admin/SetType.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SetType.java index 428dd9e..b38bb92 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SetType.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java b/src/main/java/bentobox/addon/challenges/commands/admin/SurroundChallengeBuilder.java similarity index 94% rename from src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java rename to src/main/java/bentobox/addon/challenges/commands/admin/SurroundChallengeBuilder.java index b40ad76..a5fbd2c 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/SurroundChallengeBuilder.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.EnumMap; import java.util.Map; @@ -6,7 +6,7 @@ import java.util.Map; import org.bukkit.Material; import org.bukkit.entity.EntityType; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.user.User; /** diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java b/src/main/java/bentobox/addon/challenges/commands/admin/TakeItems.java similarity index 93% rename from src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java rename to src/main/java/bentobox/addon/challenges/commands/admin/TakeItems.java index ae2f77d..ba08d41 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java +++ b/src/main/java/bentobox/addon/challenges/commands/admin/TakeItems.java @@ -1,11 +1,11 @@ /** * */ -package bskyblock.addon.challenges.commands.admin; +package bentobox.addon.challenges.commands.admin; import java.util.List; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java b/src/main/java/bentobox/addon/challenges/database/object/ChallengeLevels.java similarity index 98% rename from src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java rename to src/main/java/bentobox/addon/challenges/database/object/ChallengeLevels.java index 852f1f9..8a40b43 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java +++ b/src/main/java/bentobox/addon/challenges/database/object/ChallengeLevels.java @@ -1,11 +1,11 @@ -package bskyblock.addon.challenges.database.object; +package bentobox.addon.challenges.database.object; import java.util.ArrayList; import java.util.List; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.ChallengesManager; +import bentobox.addon.challenges.ChallengesManager; import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.database.objects.DataObject; diff --git a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java b/src/main/java/bentobox/addon/challenges/database/object/Challenges.java similarity index 99% rename from src/main/java/bskyblock/addon/challenges/database/object/Challenges.java rename to src/main/java/bentobox/addon/challenges/database/object/Challenges.java index 2c8e2e8..b106f1e 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java +++ b/src/main/java/bentobox/addon/challenges/database/object/Challenges.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges.database.object; +package bentobox.addon.challenges.database.object; import java.util.ArrayList; import java.util.EnumMap; @@ -12,7 +12,7 @@ import org.bukkit.World; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.ChallengesManager; +import bentobox.addon.challenges.ChallengesManager; import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.database.objects.DataObject; diff --git a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java b/src/main/java/bentobox/addon/challenges/database/object/PlayerData.java similarity index 98% rename from src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java rename to src/main/java/bentobox/addon/challenges/database/object/PlayerData.java index 443db8c..ff07ccd 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java +++ b/src/main/java/bentobox/addon/challenges/database/object/PlayerData.java @@ -1,7 +1,7 @@ /** * */ -package bskyblock.addon.challenges.database.object; +package bentobox.addon.challenges.database.object; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java b/src/main/java/bentobox/addon/challenges/panel/ChallengesPanels.java similarity index 96% rename from src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java rename to src/main/java/bentobox/addon/challenges/panel/ChallengesPanels.java index 74f7e7d..a8d249a 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java +++ b/src/main/java/bentobox/addon/challenges/panel/ChallengesPanels.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges.panel; +package bentobox.addon.challenges.panel; import java.util.ArrayList; import java.util.Collection; @@ -9,12 +9,12 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.inventory.ItemStack; -import bskyblock.addon.challenges.ChallengesAddon; -import bskyblock.addon.challenges.ChallengesManager; -import bskyblock.addon.challenges.LevelStatus; -import bskyblock.addon.challenges.commands.ChallengesCommand; -import bskyblock.addon.challenges.database.object.Challenges; -import bskyblock.addon.challenges.database.object.Challenges.ChallengeType; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesManager; +import bentobox.addon.challenges.LevelStatus; +import bentobox.addon.challenges.commands.ChallengesCommand; +import bentobox.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.database.object.Challenges.ChallengeType; import world.bentobox.bentobox.api.panels.Panel; import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java b/src/main/java/bentobox/addon/challenges/panel/CreateChallengeListener.java similarity index 90% rename from src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java rename to src/main/java/bentobox/addon/challenges/panel/CreateChallengeListener.java index 6bf1f7d..30e724e 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java +++ b/src/main/java/bentobox/addon/challenges/panel/CreateChallengeListener.java @@ -1,9 +1,9 @@ -package bskyblock.addon.challenges.panel; +package bentobox.addon.challenges.panel; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.panels.PanelListener; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java b/src/main/java/bentobox/addon/challenges/panel/CreateChallengePanel.java similarity index 78% rename from src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java rename to src/main/java/bentobox/addon/challenges/panel/CreateChallengePanel.java index 0176e0d..391d2b0 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java +++ b/src/main/java/bentobox/addon/challenges/panel/CreateChallengePanel.java @@ -1,6 +1,6 @@ -package bskyblock.addon.challenges.panel; +package bentobox.addon.challenges.panel; -import bskyblock.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesAddon; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java b/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java similarity index 92% rename from src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java rename to src/main/java/bentobox/addon/challenges/panel/TryToComplete.java index f42f422..3b08382 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java +++ b/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java @@ -1,7 +1,7 @@ /** * */ -package bskyblock.addon.challenges.panel; +package bentobox.addon.challenges.panel; import java.util.ArrayList; import java.util.EnumMap; @@ -14,12 +14,13 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; -import bskyblock.addon.challenges.ChallengesAddon; -import bskyblock.addon.challenges.ChallengesManager; -import bskyblock.addon.challenges.commands.ChallengesCommand; -import bskyblock.addon.challenges.database.object.Challenges; -import bskyblock.addon.challenges.database.object.Challenges.ChallengeType; -import bskyblock.addon.level.Level; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ChallengesManager; +import bentobox.addon.challenges.commands.ChallengesCommand; +import bentobox.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.database.object.Challenges.ChallengeType; +import bentobox.addon.level.Level; +import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; @@ -143,9 +144,14 @@ public class TryToComplete { private ChallengeResult checkLevel() { // Check if the level addon is installed or not - return addon.getAddonByName("BSkyBlock-Level") - .map(l -> ((Level)l).getIslandLevel(world, user.getUniqueId()) >= challenge.getReqIslandlevel() ? new ChallengeResult().setMeetsRequirements() : new ChallengeResult() - ).orElse(new ChallengeResult()); + long level = addon.getAddonByName("BentoBox-Level") + .map(l -> ((Level)l).getIslandLevel(world, user.getUniqueId())).orElse(0L); + if (level >= challenge.getReqIslandlevel()) { + return new ChallengeResult().setMeetsRequirements(); + } else { + user.sendMessage("challenges.error.island-level", TextVariables.NUMBER, String.valueOf(level)); + return new ChallengeResult(); + } } private ChallengeResult checkSurrounding() { diff --git a/src/test/java/bskyblock/addon/challenges/ChallengesAddonTest.java b/src/test/java/bentobox/addon/challenges/ChallengesAddonTest.java similarity index 95% rename from src/test/java/bskyblock/addon/challenges/ChallengesAddonTest.java rename to src/test/java/bentobox/addon/challenges/ChallengesAddonTest.java index b2fb555..ae07315 100644 --- a/src/test/java/bskyblock/addon/challenges/ChallengesAddonTest.java +++ b/src/test/java/bentobox/addon/challenges/ChallengesAddonTest.java @@ -1,7 +1,7 @@ /** * */ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -35,8 +35,8 @@ import org.powermock.modules.junit4.PowerMockRunner; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import bskyblock.addon.challenges.database.object.Challenges; -import bskyblock.addon.challenges.database.object.Challenges.ChallengeType; +import bentobox.addon.challenges.database.object.Challenges; +import bentobox.addon.challenges.database.object.Challenges.ChallengeType; /** * @author tastybento diff --git a/src/test/java/bskyblock/addon/challenges/ParseItemTest.java b/src/test/java/bentobox/addon/challenges/ParseItemTest.java similarity index 97% rename from src/test/java/bskyblock/addon/challenges/ParseItemTest.java rename to src/test/java/bentobox/addon/challenges/ParseItemTest.java index 5f5be60..03e8c60 100644 --- a/src/test/java/bskyblock/addon/challenges/ParseItemTest.java +++ b/src/test/java/bentobox/addon/challenges/ParseItemTest.java @@ -1,4 +1,4 @@ -package bskyblock.addon.challenges; +package bentobox.addon.challenges; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,6 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.modules.junit4.PowerMockRunner; +import bentobox.addon.challenges.ChallengesAddon; +import bentobox.addon.challenges.ParseItem; + @RunWith(PowerMockRunner.class) public class ParseItemTest {