Skip to content

Commit

Permalink
Rename Challenges and ChallengeLevels classes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@BONNe
BONNe committed Jan 23, 2019
1 parent 59c0f6b commit dba5a44
Show file tree
Hide file tree
Showing 18 changed files with 144 additions and 144 deletions.
18 changes: 9 additions & 9 deletions src/main/java/world/bentobox/challenges/ChallengesImportManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;

import world.bentobox.challenges.database.object.ChallengeLevels;
import world.bentobox.challenges.database.object.Challenges;
import world.bentobox.challenges.database.object.ChallengeLevel;
import world.bentobox.challenges.database.object.Challenge;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.util.Util;

Expand Down Expand Up @@ -78,7 +78,7 @@ private void makeLevels(User user) {
String[] lvs = levels.split(" ");
int order = 0;
for (String level : lvs) {
ChallengeLevels challengeLevel = new ChallengeLevels();
ChallengeLevel challengeLevel = new ChallengeLevel();
challengeLevel.setFriendlyName(level);
challengeLevel.setUniqueId(level);
challengeLevel.setOrder(order++);
Expand Down Expand Up @@ -110,7 +110,7 @@ private void makeChallenges(User user, World world, boolean overwrite) {
// Parse the challenge file
ConfigurationSection chals = chal.getConfigurationSection("challenges.challengeList");
for (String challenge : chals.getKeys(false)) {
Challenges newChallenge = new Challenges();
Challenge newChallenge = new Challenge();
newChallenge.setUniqueId(Util.getWorld(world).getName() + "_" + challenge);
newChallenge.setDeployed(true);
ConfigurationSection details = chals.getConfigurationSection(challenge);
Expand All @@ -119,7 +119,7 @@ private void makeChallenges(User user, World world, boolean overwrite) {
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));
newChallenge.setChallengeType(Challenges.ChallengeType.valueOf(details.getString("type","INVENTORY").toUpperCase()));
newChallenge.setChallengeType(Challenge.ChallengeType.valueOf(details.getString("type","INVENTORY").toUpperCase()));
newChallenge.setTakeItems(details.getBoolean("takeItems",true));
newChallenge.setRewardText(details.getString("rewardText", ""));
newChallenge.setRewardCommands(details.getStringList("rewardcommands"));
Expand All @@ -135,11 +135,11 @@ private void makeChallenges(User user, World world, boolean overwrite) {
newChallenge.setReqMoney(details.getInt("requiredMoney"));
newChallenge.setReqExp(details.getInt("requiredExp"));
String reqItems = details.getString("requiredItems","");
if (newChallenge.getChallengeType().equals(Challenges.ChallengeType.INVENTORY)) {
if (newChallenge.getChallengeType().equals(Challenge.ChallengeType.INVENTORY)) {
newChallenge.setRequiredItems(parseItems(reqItems));
} else if (newChallenge.getChallengeType().equals(Challenges.ChallengeType.LEVEL)) {
} else if (newChallenge.getChallengeType().equals(Challenge.ChallengeType.LEVEL)) {
newChallenge.setReqIslandlevel(Long.parseLong(reqItems));
} else if (newChallenge.getChallengeType().equals(Challenges.ChallengeType.ISLAND)) {
} else if (newChallenge.getChallengeType().equals(Challenge.ChallengeType.ISLAND)) {
parseEntities(newChallenge, reqItems);
}
newChallenge.setRewardItems(parseItems(details.getString("itemReward")));
Expand All @@ -158,7 +158,7 @@ private void makeChallenges(User user, World world, boolean overwrite) {
* @param challenge - challenge to be adjusted
* @param string - string from YAML file
*/
private void parseEntities(Challenges challenge, String string) {
private void parseEntities(Challenge challenge, String string) {
Map<EntityType, Integer> req = new EnumMap<>(EntityType.class);
Map<Material, Integer> blocks = new EnumMap<>(Material.class);
if (!string.isEmpty()) {
Expand Down
98 changes: 49 additions & 49 deletions src/main/java/world/bentobox/challenges/ChallengesManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
import world.bentobox.bentobox.database.Database;
import world.bentobox.bentobox.util.Util;
import world.bentobox.challenges.commands.admin.SurroundChallengeBuilder;
import world.bentobox.challenges.database.object.ChallengeLevels;
import world.bentobox.challenges.database.object.Challenges;
import world.bentobox.challenges.database.object.Challenges.ChallengeType;
import world.bentobox.challenges.database.object.ChallengeLevel;
import world.bentobox.challenges.database.object.Challenge;
import world.bentobox.challenges.database.object.Challenge.ChallengeType;
import world.bentobox.challenges.database.object.ChallengesPlayerData;
import world.bentobox.challenges.panel.ChallengesPanels;

public class ChallengesManager {

public static final String FREE = "Free";
private Map<ChallengeLevels, Set<Challenges>> challengeMap;
private Config<Challenges> chConfig;
private Config<ChallengeLevels> lvConfig;
private Map<ChallengeLevel, Set<Challenge>> challengeMap;
private Config<Challenge> chConfig;
private Config<ChallengeLevel> lvConfig;
private Database<ChallengesPlayerData> players;
private ChallengesPanels challengesPanels;
private Map<UUID,ChallengesPlayerData> playerData;
Expand All @@ -37,8 +37,8 @@ public class ChallengesManager {
public ChallengesManager(ChallengesAddon addon) {
this.addon = addon;
// Set up the configs
chConfig = new Config<>(addon, Challenges.class);
lvConfig = new Config<>(addon, ChallengeLevels.class);
chConfig = new Config<>(addon, Challenge.class);
lvConfig = new Config<>(addon, ChallengeLevel.class);
// Players is where all the player history will be stored
players = new Database<>(addon, ChallengesPlayerData.class);
// Cache of challenges
Expand Down Expand Up @@ -78,7 +78,7 @@ private void addPlayer(User user) {
* @param challenge - challenge
* @return - number of times
*/
public long checkChallengeTimes(User user, Challenges challenge, World world) {
public long checkChallengeTimes(User user, Challenge challenge, World world) {
addPlayer(user);
return playerData.get(user.getUniqueId()).getTimes(world, challenge.getUniqueId());
}
Expand Down Expand Up @@ -109,7 +109,7 @@ public boolean createInvChallenge(User user, Inventory inventory) {
if (inventory.getContents().length == 0) {
return false;
}
Challenges newChallenge = new Challenges();
Challenge newChallenge = new Challenge();
newChallenge.setChallengeType(ChallengeType.INVENTORY);
newChallenge.setFriendlyName(inventory.getTitle());
newChallenge.setDeployed(false);
Expand Down Expand Up @@ -154,7 +154,7 @@ public boolean createSurroundingChallenge(SurroundChallengeBuilder challengeInfo
challengeInfo.getOwner().sendMessage("challenges.error.no-items-clicked");
return false;
}
Challenges newChallenge = new Challenges();
Challenge newChallenge = new Challenge();
newChallenge.setChallengeType(ChallengeType.ISLAND);
newChallenge.setFriendlyName(challengeInfo.getName());
newChallenge.setDeployed(true);
Expand Down Expand Up @@ -199,10 +199,10 @@ public List<String> getAllChallengesList(World world) {
* @param world - world to check
* @return - challenge or null if it does not exist
*/
public Challenges getChallenge(String name, World world) {
public Challenge getChallenge(String name, World world) {
String worldName = Util.getWorld(world).getName();
for (Set<Challenges> ch : challengeMap.values()) {
Optional<Challenges> challenge = ch.stream().filter(c -> c.getUniqueId().equalsIgnoreCase(worldName + name)).findFirst();
for (Set<Challenge> ch : challengeMap.values()) {
Optional<Challenge> challenge = ch.stream().filter(c -> c.getUniqueId().equalsIgnoreCase(worldName + name)).findFirst();
if (challenge.isPresent()) {
return challenge.get();
}
Expand All @@ -223,11 +223,11 @@ public List<LevelStatus> getChallengeLevelStatus(User user, World world)
List<LevelStatus> result = new ArrayList<>();

// The first level is always unlocked
ChallengeLevels previousLevel = null;
ChallengeLevel previousLevel = null;
int doneChallengeCount = Integer.MAX_VALUE;

// For each challenge level, check how many the user has done
for (Entry<ChallengeLevels, Set<Challenges>> entry : this.challengeMap.entrySet())
for (Entry<ChallengeLevel, Set<Challenge>> entry : this.challengeMap.entrySet())
{
// Check how much challenges must be done in previous level.
int challengesToDo = Math.max(0, entry.getKey().getWaiveramount() - doneChallengeCount);
Expand All @@ -254,7 +254,7 @@ public List<LevelStatus> getChallengeLevelStatus(User user, World world)
* Get the challenge list
* @return the challengeList
*/
public Map<ChallengeLevels, Set<Challenges>> getChallengeList() {
public Map<ChallengeLevel, Set<Challenge>> getChallengeList() {
// TODO return the challenges for world
return challengeMap;
}
Expand All @@ -265,9 +265,9 @@ public Map<ChallengeLevels, Set<Challenges>> getChallengeList() {
* @param world
* @return the set of challenges for this level, or the first set of challenges if level is blank, or a blank list if there are no challenges
*/
public Set<Challenges> getChallenges(String level, World world) {
public Set<Challenge> getChallenges(String level, World world) {
String worldName = Util.getWorld(world).getName();
Optional<ChallengeLevels> lv = challengeMap.keySet().stream().filter(l -> l.getUniqueId().equalsIgnoreCase(level)).findFirst();
Optional<ChallengeLevel> lv = challengeMap.keySet().stream().filter(l -> l.getUniqueId().equalsIgnoreCase(level)).findFirst();
// Get the challenges applicable to this world
return lv.isPresent() ? challengeMap.get(lv.get()).stream()
.filter(c -> c.getWorld().equalsIgnoreCase(worldName) || c.getWorld().isEmpty()).collect(Collectors.toSet())
Expand All @@ -286,9 +286,9 @@ public ChallengesPanels getChallengesPanels() {
* @param currentLevel - the current level
* @return the previous level, or null if there is none
*/
public ChallengeLevels getPreviousLevel(ChallengeLevels currentLevel) {
ChallengeLevels result = null;
for (ChallengeLevels level : challengeMap.keySet()) {
public ChallengeLevel getPreviousLevel(ChallengeLevel currentLevel) {
ChallengeLevel result = null;
for (ChallengeLevel level : challengeMap.keySet()) {
if (level.equals(currentLevel)) {
return result;
}
Expand All @@ -303,7 +303,7 @@ public ChallengeLevels getPreviousLevel(ChallengeLevels currentLevel) {
* @return true if it exists, otherwise false
*/
public boolean isChallenge(String name) {
for (Set<Challenges> ch : challengeMap.values()) {
for (Set<Challenge> ch : challengeMap.values()) {
if (ch.stream().anyMatch(c -> c.getUniqueId().equalsIgnoreCase(name))) {
return true;
}
Expand All @@ -318,7 +318,7 @@ public boolean isChallenge(String name) {
* @return true if it exists, otherwise false
*/
public boolean isChallenge(World world, String name) {
for (Set<Challenges> ch : challengeMap.values()) {
for (Set<Challenge> ch : challengeMap.values()) {
if (ch.stream().filter(c -> c.getWorld().equals(Util.getWorld(world).getName())).anyMatch(c -> c.getUniqueId().equalsIgnoreCase(name))) {
return true;
}
Expand Down Expand Up @@ -417,7 +417,7 @@ public void setResetChallenge(User user, String challengeUniqueId, World world)
/**
* @param challengeList the challengeList to set
*/
public void setChallengeList(Map<ChallengeLevels, Set<Challenges>> challengeList) {
public void setChallengeList(Map<ChallengeLevel, Set<Challenge>> challengeList) {
this.challengeMap = challengeList;
}

Expand All @@ -435,7 +435,7 @@ public void sortChallenges() {
* @param challenge
* @return true if successful
*/
private boolean storeChallenge(Challenges challenge) {
private boolean storeChallenge(Challenge challenge) {
return storeChallenge(challenge, true, null, true);
}

Expand All @@ -447,15 +447,15 @@ private boolean storeChallenge(Challenges challenge) {
* @param silent - if true, no messages are sent to user
* @return - true if imported
*/
public boolean storeChallenge(Challenges challenge, boolean overwrite, User user, boolean silent) {
public boolean storeChallenge(Challenge challenge, boolean overwrite, User user, boolean silent) {
// See if we have this level already
ChallengeLevels level;
ChallengeLevel level;
if (lvConfig.configObjectExists(challenge.getLevel())) {
// Get it from the database
level = lvConfig.loadConfigObject(challenge.getLevel());
} else {
// Make it
level = new ChallengeLevels();
level = new ChallengeLevel();
level.setUniqueId(challenge.getLevel());
lvConfig.saveConfigObject(level);
}
Expand Down Expand Up @@ -485,7 +485,7 @@ public boolean storeChallenge(Challenges challenge, boolean overwrite, User user
* Store a challenge level
* @param level the challenge level
*/
public void storeLevel(ChallengeLevels level) {
public void storeLevel(ChallengeLevel level) {
lvConfig.saveConfigObject(level);
}

Expand Down Expand Up @@ -517,37 +517,37 @@ public void resetAllChallenges(UUID uuid, World world) {
}


public Challenges createChallenge()
public Challenge createChallenge()
{
return new Challenges();
return new Challenge();
}


public List<Challenges> getChallenges(ChallengeLevels challengeLevel)
public List<Challenge> getChallenges(ChallengeLevel challengeLevel)
{
return new ArrayList<>(this.challengeMap.get(challengeLevel));
}


public List<ChallengeLevels> getChallengeLevelList()
public List<ChallengeLevel> getChallengeLevelList()
{
return new ArrayList<>(this.challengeMap.keySet());
}


public List<Challenges> getChallengesList()
public List<Challenge> getChallengesList()
{
return new ArrayList<>();
}


public void deleteChallenge(Challenges selectedChallenge)
public void deleteChallenge(Challenge selectedChallenge)
{

}


public void deleteChallengeLevel(ChallengeLevels valueObject)
public void deleteChallengeLevel(ChallengeLevel valueObject)
{

}
Expand All @@ -558,9 +558,9 @@ public void resetAllChallenges(User uuid, World world)
}


public Challenges createChallenge(String reply)
public Challenge createChallenge(String reply)
{
return new Challenges();
return new Challenge();
}


Expand All @@ -576,55 +576,55 @@ public boolean validateLevelUniqueID(World world, String reply)
}


public ChallengeLevels createLevel(String reply)
public ChallengeLevel createLevel(String reply)
{
return new ChallengeLevels();
return new ChallengeLevel();
}


public void unlinkChallenge(ChallengeLevels challengeLevel, Challenges value)
public void unlinkChallenge(ChallengeLevel challengeLevel, Challenge value)
{

}


public void linkChallenge(ChallengeLevels challengeLevel, Challenges value)
public void linkChallenge(ChallengeLevel challengeLevel, Challenge value)
{

}


public void resetChallenge(UUID uniqueId, Challenges value)
public void resetChallenge(UUID uniqueId, Challenge value)
{

}


public void completeChallenge(UUID uniqueId, Challenges value)
public void completeChallenge(UUID uniqueId, Challenge value)
{

}


public List<Challenges> getFreeChallenges(User user, World world)
public List<Challenge> getFreeChallenges(User user, World world)
{
return Collections.emptyList();
}


public String getChallengesLevel(Challenges challenge)
public String getChallengesLevel(Challenge challenge)
{
return "HERE NEED LEVEL NAME";
}


public boolean isChallengeComplete(User user, Challenges challenge)
public boolean isChallengeComplete(User user, Challenge challenge)
{
return this.isChallengeComplete(user, challenge.getUniqueId(), user.getWorld());
}


public long checkChallengeTimes(User user, Challenges challenge)
public long checkChallengeTimes(User user, Challenge challenge)
{
return this.checkChallengeTimes(user, challenge, user.getWorld());
}
Expand Down

0 comments on commit dba5a44

Please sign in to comment.