From 353a9c3309f9906505d6fee56a34f707723e3ee6 Mon Sep 17 00:00:00 2001 From: tastybento Date: Wed, 1 Aug 2018 09:52:49 -0700 Subject: [PATCH] Updated to new package name --- .../addon/challenges/ChallengesAddon.java | 4 ++-- .../addon/challenges/ChallengesManager.java | 8 ++++---- .../challenges/FreshSqueezedChallenges.java | 12 ++++++------ .../challenges/commands/ChallengesCommand.java | 4 ++-- .../admin/ChallengesAdminImportCommand.java | 6 +++--- .../commands/admin/CreateChallenge.java | 6 +++--- .../commands/admin/CreateSurrounding.java | 6 +++--- .../challenges/commands/admin/MakeLevel.java | 4 ++-- .../challenges/commands/admin/SetDeployed.java | 4 ++-- .../commands/admin/SetDescription.java | 4 ++-- .../addon/challenges/commands/admin/SetExp.java | 4 ++-- .../commands/admin/SetFriendlyName.java | 4 ++-- .../addon/challenges/commands/admin/SetIcon.java | 4 ++-- .../challenges/commands/admin/SetLevel.java | 4 ++-- .../challenges/commands/admin/SetMaxTimes.java | 4 ++-- .../addon/challenges/commands/admin/SetPerm.java | 4 ++-- .../challenges/commands/admin/SetRepeatable.java | 4 ++-- .../challenges/commands/admin/SetReward.java | 4 ++-- .../addon/challenges/commands/admin/SetType.java | 4 ++-- .../commands/admin/SurroundChallengeBuilder.java | 2 +- .../challenges/commands/admin/TakeItems.java | 4 ++-- .../database/object/ChallengeLevels.java | 4 ++-- .../challenges/database/object/Challenges.java | 4 ++-- .../challenges/database/object/PlayerData.java | 14 +++++++------- .../addon/challenges/panel/ChallengesPanels.java | 10 +++++----- .../panel/CreateChallengeListener.java | 4 ++-- .../challenges/panel/CreateChallengePanel.java | 4 ++-- .../addon/challenges/panel/TryToComplete.java | 16 ++++++++-------- 28 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java index da914a1..c584e58 100644 --- a/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java +++ b/src/main/java/bskyblock/addon/challenges/ChallengesAddon.java @@ -4,8 +4,8 @@ import org.bukkit.Bukkit; import bskyblock.addon.challenges.commands.ChallengesCommand; import bskyblock.addon.challenges.commands.admin.ChallengesAdminImportCommand; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.commands.CompositeCommand; /** * Add-on to BSkyBlock that enables challenges diff --git a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java index e240975..8cdc6e6 100644 --- a/src/main/java/bskyblock/addon/challenges/ChallengesManager.java +++ b/src/main/java/bskyblock/addon/challenges/ChallengesManager.java @@ -26,10 +26,10 @@ 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 world.bentobox.bbox.api.configuration.BSBConfig; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.BSBDatabase; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.configuration.BSBConfig; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.BSBDatabase; +import world.bentobox.bentobox.util.Util; public class ChallengesManager { diff --git a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java b/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java index ab4f075..4aa3309 100644 --- a/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java +++ b/src/main/java/bskyblock/addon/challenges/FreshSqueezedChallenges.java @@ -18,8 +18,8 @@ import org.bukkit.inventory.ItemStack; import bskyblock.addon.challenges.database.object.ChallengeLevels; import bskyblock.addon.challenges.database.object.Challenges; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * Imports challenges @@ -42,7 +42,7 @@ public class FreshSqueezedChallenges { addon.saveResource("challenges.yml",false); } } - + /** * Import challenges * @param user - user @@ -101,8 +101,8 @@ public class FreshSqueezedChallenges { /** * Imports challenges - * @param overwrite - * @param args + * @param overwrite + * @param args */ private void makeChallenges(User user, World world, boolean overwrite) { int size = 0; @@ -114,7 +114,7 @@ public class FreshSqueezedChallenges { newChallenge.setDeployed(true); ConfigurationSection details = chals.getConfigurationSection(challenge); newChallenge.setFriendlyName(details.getString("friendlyname", challenge)); - newChallenge.setWorld(Util.getWorld(world).getName()); + newChallenge.setWorld(Util.getWorld(world).getName()); newChallenge.setDescription(addon.getChallengesManager().stringSplit(details.getString("description", ""))); newChallenge.setIcon(new ParseItem(addon, details.getString("icon") + ":1").getItem()); newChallenge.setLevel(details.getString("level", ChallengesManager.FREE)); diff --git a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java b/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java index 3fc073d..c7bcbf9 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java +++ b/src/main/java/bskyblock/addon/challenges/commands/ChallengesCommand.java @@ -4,8 +4,8 @@ import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; import bskyblock.addon.challenges.panel.ChallengesPanels; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class ChallengesCommand extends CompositeCommand { public static final String CHALLENGE_COMMAND = "challenges"; diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java b/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java index 8e9229b..22c9c1a 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/ChallengesAdminImportCommand.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Optional; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class ChallengesAdminImportCommand extends CompositeCommand { diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java index 5ae9e41..b7a52a3 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateChallenge.java @@ -4,9 +4,9 @@ import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; import bskyblock.addon.challenges.panel.CreateChallengeListener; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.user.User; public class CreateChallenge extends CompositeCommand { 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 ebbc756..2bafb40 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/CreateSurrounding.java @@ -17,9 +17,9 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * Command to create a surrounding type challenge diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java b/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java index ce8feee..99a74da 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/MakeLevel.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java index be35a71..9b8ffe9 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDeployed.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java index 9fcd67f..3d92c69 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetDescription.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java index a270d01..887ab9c 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetExp.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java index 263263b..f687548 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetFriendlyName.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java index b0cfe38..cd8d009 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetIcon.java @@ -9,8 +9,8 @@ import org.bukkit.inventory.ItemStack; import bskyblock.addon.challenges.ChallengesAddon; import bskyblock.addon.challenges.database.object.Challenges; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java index 320a27e..da2ba40 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetLevel.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java index 2cabf36..39cab09 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetMaxTimes.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java index 8f2b0c1..158ba1f 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetPerm.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java index 448cd09..f2d624f 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetRepeatable.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java index c76e01e..7f3c2ea 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetReward.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java index b9d7795..428dd9e 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SetType.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java b/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java index 8df20f2..b40ad76 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/SurroundChallengeBuilder.java @@ -7,7 +7,7 @@ import org.bukkit.Material; import org.bukkit.entity.EntityType; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.user.User; /** * Enables the state of a Surrounding Challenge to be stored as it is built diff --git a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java b/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java index 2a3f45f..ae2f77d 100644 --- a/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java +++ b/src/main/java/bskyblock/addon/challenges/commands/admin/TakeItems.java @@ -6,8 +6,8 @@ package bskyblock.addon.challenges.commands.admin; import java.util.List; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java b/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java index 2c77d4a..99cbcdc 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java +++ b/src/main/java/bskyblock/addon/challenges/database/object/ChallengeLevels.java @@ -6,8 +6,8 @@ import java.util.List; import org.bukkit.inventory.ItemStack; import bskyblock.addon.challenges.ChallengesManager; -import world.bentobox.bbox.api.configuration.ConfigComment; -import world.bentobox.bbox.database.objects.DataObject; +import world.bentobox.bentobox.api.configuration.ConfigComment; +import world.bentobox.bentobox.database.objects.DataObject; /** * Represent a challenge level diff --git a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java b/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java index b27671a..3f00f89 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java +++ b/src/main/java/bskyblock/addon/challenges/database/object/Challenges.java @@ -13,8 +13,8 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; import bskyblock.addon.challenges.ChallengesManager; -import world.bentobox.bbox.api.configuration.ConfigComment; -import world.bentobox.bbox.database.objects.DataObject; +import world.bentobox.bentobox.api.configuration.ConfigComment; +import world.bentobox.bentobox.database.objects.DataObject; /** * Data object for challenges diff --git a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java b/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java index 7e49971..07016f8 100644 --- a/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java +++ b/src/main/java/bskyblock/addon/challenges/database/object/PlayerData.java @@ -1,5 +1,5 @@ /** - * + * */ package bskyblock.addon.challenges.database.object; @@ -12,8 +12,8 @@ import org.bukkit.World; import com.google.gson.annotations.Expose; -import world.bentobox.bbox.database.objects.DataObject; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.database.objects.DataObject; +import world.bentobox.bentobox.util.Util; /** * Stores the player's challenge situation @@ -36,7 +36,7 @@ public class PlayerData implements DataObject { // Required for bean instantiation public PlayerData() {} - + /** * Mark a challenge as having been completed. Will increment the number of times and timestamp * @param challengeName - unique challenge name @@ -47,7 +47,7 @@ public class PlayerData implements DataObject { challengeStatus.put(name, times); challengesTimestamp.put(name, System.currentTimeMillis()); } - + /** * Check if a challenge has been done * @param challengeName - unique challenge name @@ -56,7 +56,7 @@ public class PlayerData implements DataObject { public boolean isChallengeDone(World world, String challengeName) { return getTimes(world, challengeName) > 0; } - + /** * Check how many times a challenge has been done * @param challengeName - unique challenge name @@ -65,7 +65,7 @@ public class PlayerData implements DataObject { public int getTimes(World world, String challengeName) { return challengeStatus.getOrDefault(Util.getWorld(world).getName() + challengeName, 0); } - + /** * Creates a player data entry * @param uniqueId - the player's UUID in string format diff --git a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java index d8d5866..74f7e7d 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java +++ b/src/main/java/bskyblock/addon/challenges/panel/ChallengesPanels.java @@ -15,11 +15,11 @@ 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 world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; public class ChallengesPanels { diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java index f2e5439..6bf1f7d 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java +++ b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengeListener.java @@ -4,8 +4,8 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.panels.PanelListener; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.PanelListener; +import world.bentobox.bentobox.api.user.User; public class CreateChallengeListener implements PanelListener { diff --git a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java index bcb64fd..0176e0d 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java +++ b/src/main/java/bskyblock/addon/challenges/panel/CreateChallengePanel.java @@ -1,8 +1,8 @@ package bskyblock.addon.challenges.panel; import bskyblock.addon.challenges.ChallengesAddon; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.user.User; public class CreateChallengePanel { diff --git a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java b/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java index e82261b..f42f422 100644 --- a/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java +++ b/src/main/java/bskyblock/addon/challenges/panel/TryToComplete.java @@ -1,5 +1,5 @@ /** - * + * */ package bskyblock.addon.challenges.panel; @@ -20,8 +20,8 @@ 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 world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * Run when a user tries to complete a challenge @@ -52,7 +52,7 @@ public class TryToComplete { this.user = user; this.manager = manager; this.challenge = challenge; - + // Check if can complete challenge ChallengeResult result = checkIfCanCompleteChallenge(); if (!result.meetsRequirements) { @@ -93,7 +93,7 @@ public class TryToComplete { * Checks if a challenge can be completed or not */ private ChallengeResult checkIfCanCompleteChallenge() { - // Check if user has the + // Check if user has the if (!challenge.getLevel().equals(ChallengesManager.FREE) && !manager.isLevelUnlocked(user, challenge.getLevel(), world)) { user.sendMessage("challenges.errors.challenge-level-not-available"); return new ChallengeResult(); @@ -104,7 +104,7 @@ public class TryToComplete { return new ChallengeResult(); } // Check repeatability - if (manager.isChallengeComplete(user, challenge.getUniqueId(), world) + if (manager.isChallengeComplete(user, challenge.getUniqueId(), world) && (!challenge.isRepeatable() || challenge.getChallengeType().equals(ChallengeType.LEVEL) || challenge.getChallengeType().equals(ChallengeType.ISLAND))) { user.sendMessage("challenges.not-repeatable"); @@ -170,7 +170,7 @@ public class TryToComplete { for (int z = -searchRadius; z <= searchRadius; z++) { Material mat = user.getWorld().getBlockAt(user.getLocation().add(new Vector(x,y,z))).getType(); // Remove one - blocks.computeIfPresent(mat, (b, amount) -> amount - 1); + blocks.computeIfPresent(mat, (b, amount) -> amount - 1); // Remove any that have an amount of 0 blocks.entrySet().removeIf(en -> en.getValue() <= 0); } @@ -241,7 +241,7 @@ public class TryToComplete { cmd = cmd.substring(6,cmd.length()).replace("[player]", user.getName()).trim(); try { if (!user.performCommand(cmd)) { - showError(cmd); + showError(cmd); } } catch (Exception e) { showError(cmd);