Skip to content

Commit

Permalink
Rework Challenges Addon Language structure.
Browse files Browse the repository at this point in the history 
Reorganize structure.
Add missing translations.
Add colors.
  • Loading branch information
@BONNe
BONNe committed Feb 11, 2019
1 parent b2201ec commit ab3275c
Show file tree
Hide file tree
Showing 33 changed files with 966 additions and 648 deletions.
12 changes: 7 additions & 5 deletions src/main/java/world/bentobox/challenges/ChallengesImportManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ public ChallengesImportManager(ChallengesAddon challengesAddon) {
public boolean importChallenges(User user, World world, boolean overwrite) {
File challengeFile = new File(addon.getDataFolder(), "challenges.yml");
if (!challengeFile.exists()) {
user.sendMessage("challenges.admin.import.no-file");
user.sendMessage("challenges.errors.import-no-file");
return false;
}
chal = new YamlConfiguration();
try {
chal.load(challengeFile);
} catch (IOException | InvalidConfigurationException e) {
user.sendMessage("challenges.admin.import.no-load","[message]", e.getMessage());
user.sendMessage("challenges.errors.no-load","[message]", e.getMessage());
return false;
}
makeLevels(user, world, overwrite);
Expand All @@ -76,7 +76,7 @@ private void makeLevels(User user, World world, boolean overwrite) {
// Parse the levels
String levels = chal.getString("challenges.levels", "");
if (!levels.isEmpty()) {
user.sendMessage("challenges.admin.import.levels", "[levels]", levels);
user.sendMessage("challenges.messages.import-levels");
String[] lvs = levels.split(" ");
int order = 0;
for (String level : lvs) {
Expand All @@ -99,7 +99,7 @@ private void makeLevels(User user, World world, boolean overwrite) {
addon.getChallengesManager().loadLevel(challengeLevel, overwrite, user, false);
}
} else {
user.sendMessage("challenges.admin.import.no-levels");
user.sendMessage("challenges.messages.no-levels");
}
}

Expand All @@ -111,6 +111,8 @@ private void makeChallenges(User user, World world, boolean overwrite) {
int size = 0;
// Parse the challenge file
ConfigurationSection chals = chal.getConfigurationSection("challenges.challengeList");
user.sendMessage("challenges.messages.import-challenges");

for (String challenge : chals.getKeys(false)) {
Challenge newChallenge = new Challenge();
newChallenge.setUniqueId(Util.getWorld(world).getName() + "_" + challenge);
Expand Down Expand Up @@ -165,7 +167,7 @@ private void makeChallenges(User user, World world, boolean overwrite) {
}
}

user.sendMessage("challenges.admin.import.number", "[number]", String.valueOf(size));
user.sendMessage("challenges.messages.import-number", "[number]", String.valueOf(size));
}

/**
Expand Down
29 changes: 14 additions & 15 deletions src/main/java/world/bentobox/challenges/ChallengesManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ public boolean loadChallenge(Challenge challenge,
{
if (!silent)
{
user.sendMessage("challenges.admin.import.skipping",
"[object]", challenge.getFriendlyName());
user.sendMessage("challenges.messages.load-skipping",
"[value]", challenge.getFriendlyName());
}

return false;
Expand All @@ -173,17 +173,17 @@ public boolean loadChallenge(Challenge challenge,
{
if (!silent)
{
user.sendMessage("challenges.admin.import.overwriting",
"[challenge]", challenge.getFriendlyName());
user.sendMessage("challenges.messages.load-overwriting",
"[value]", challenge.getFriendlyName());
}
}
}
else
{
if (!silent)
{
user.sendMessage("challenges.admin.import.add",
"[object]", challenge.getFriendlyName());
user.sendMessage("challenges.messages.load-add",
"[value]", challenge.getFriendlyName());
}
}

Expand Down Expand Up @@ -218,8 +218,8 @@ public boolean loadLevel(ChallengeLevel level, boolean overwrite, User user, boo
{
if (user != null)
{
user.sendMessage("challenges.admin.import.error",
"[object]", level.getFriendlyName());
user.sendMessage("challenges.errors.load-error",
"[value]", level.getFriendlyName());
}
else
{
Expand All @@ -235,8 +235,8 @@ public boolean loadLevel(ChallengeLevel level, boolean overwrite, User user, boo
{
if (!silent)
{
user.sendMessage("challenges.admin.import.skipping",
"[object]", level.getFriendlyName());
user.sendMessage("challenges.messages.load-skipping",
"[value]", level.getFriendlyName());
}

return false;
Expand All @@ -245,17 +245,17 @@ public boolean loadLevel(ChallengeLevel level, boolean overwrite, User user, boo
{
if (!silent)
{
user.sendMessage("challenges.admin.import.overwriting",
"[challenge]", level.getFriendlyName());
user.sendMessage("challenges.messages.load-overwriting",
"[value]", level.getFriendlyName());
}
}
}
else
{
if (!silent)
{
user.sendMessage("challenges.admin.import.add",
"[object]", level.getFriendlyName());
user.sendMessage("challenges.messages.load-add",
"[value]", level.getFriendlyName());
}
}

Expand All @@ -281,7 +281,6 @@ private void loadPlayerData(ChallengesPlayerData playerData)
}
}


// ---------------------------------------------------------------------
// Section: Other storing related methods
// ---------------------------------------------------------------------
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/world/bentobox/challenges/Settings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,27 @@ public class Settings implements DataObject
@ConfigComment("")
private String uniqueId = "config";

/**
* Configuration version
*/
@ConfigComment("")
private String configVersion = "v1.0";

// ---------------------------------------------------------------------
// Section: Methods
// ---------------------------------------------------------------------


/**
* This method returns the configVersion object.
* @return the configVersion object.
*/
public String getConfigVersion()
{
return configVersion;
}


@Override
public String getUniqueId()
{
Expand Down Expand Up @@ -143,6 +158,16 @@ public int getLoreLineLength()
}


/**
* This method sets the configVersion object value.
* @param configVersion the configVersion object new value.
*/
public void setConfigVersion(String configVersion)
{
this.configVersion = configVersion;
}


@Override
public void setUniqueId(String uniqueId)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public boolean execute(User user, String label, List<String> args) {
@Override
public void setup() {
this.setPermission(CHALLENGE_COMMAND);
this.setParametersHelp(CHALLENGE_COMMAND + ".parameters");
this.setDescription(CHALLENGE_COMMAND + ".description");
this.setParametersHelp("challenges.commands.user.parameters");
this.setDescription("challenges.commands.user.description");
}


Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/admin/Challenges.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public Challenges(ChallengesAddon addon, CompositeCommand parent) {
@Override
public void setup() {
this.setPermission("admin.challenges");
this.setParametersHelp("challeneges.admin.parameters");
this.setDescription("challenges.admin.description");
this.setParametersHelp("challenges.commands.admin.main.parameters");
this.setDescription("challenges.commands.admin.main.description");
// Register sub commands
new ImportCommand(getAddon(), this);
// new CompleteChallenge(getAddon(), this);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/admin/CompleteChallenge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public CompleteChallenge(Addon addon, CompositeCommand parent) {
@Override
public void setup() {
this.setPermission("admin.challenges");
this.setParametersHelp("challenges.admin.complete.parameters");
this.setDescription("challenges.admin.complete.description");
this.setParametersHelp("challenges.commands.admin.complete.parameters");
this.setDescription("challenges.commands.admin.complete.description");
manager = ((ChallengesAddon)getAddon()).getChallengesManager();
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/world/bentobox/challenges/commands/admin/CreateChallenge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ public CreateChallenge(Addon addon, CompositeCommand parent) {
public void setup() {
this.setOnlyPlayer(true);
this.setPermission("admin.challenges");
this.setParametersHelp("challaneges.admin.create.parameters");
this.setDescription("challenges.admin.create.description");
this.setParametersHelp("challenges.commands.admin.create.parameters");
this.setDescription("challenges.commands.admin.create.description");

}

@Override
public boolean execute(User user, String label, List<String> args) {
if (args.isEmpty()) {
user.sendRawMessage("not enough args");
user.sendMessage("challenges.errors.no-name");
return false;
}
new PanelBuilder()
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/world/bentobox/challenges/commands/admin/CreateSurrounding.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ public CreateSurrounding(Addon addon, CompositeCommand parent) {
public void setup() {
this.setOnlyPlayer(true);
this.setPermission("admin.challenges");
this.setParametersHelp("challaneges.admin.create.surrounding.parameters");
this.setDescription("challenges.admin.create.surrounding.description");
this.setParametersHelp("challenges.commands.admin.surrounding.parameters");
this.setDescription("challenges.commands.admin.surrounding.description");
}

@Override
public boolean execute(User user, String label, List<String> args) {
if (args.isEmpty()) {
user.sendMessage("challenges.admin.error.no-name");
user.sendMessage("challenges.errors.no-name");
return false;
}
// Tell user to hit objects to add to the surrounding object requirements
user.sendMessage("challenges.admin.create.surrounding.hit-things");
user.sendMessage("challenges.messages.admin.hit-things");
inProgress.put(user.getUniqueId(), new SurroundChallengeBuilder((ChallengesAddon) getAddon()).owner(user).name(args.get(0)));
return true;
}
Expand All @@ -77,7 +77,7 @@ public boolean onPlayerInteract(PlayerInteractEvent e) {
// Prevent damage
e.setCancelled(true);
inProgress.get(e.getPlayer().getUniqueId()).addBlock(e.getClickedBlock().getType());
User.getInstance(e.getPlayer()).sendMessage("challenges.admin.you-added", "[thing]", Util.prettifyText(e.getClickedBlock().getType().toString()));
User.getInstance(e.getPlayer()).sendMessage("challenges.messages.admin.you-added", "[thing]", Util.prettifyText(e.getClickedBlock().getType().toString()));
return true;
}

Expand All @@ -92,7 +92,7 @@ private boolean finished(Cancellable e, UUID uuid) {
e.setCancelled(true);
boolean status = inProgress.get(uuid).build();
if (status) {
inProgress.get(uuid).getOwner().sendMessage("challenges.admin.challenge-created", "[challenge]", inProgress.get(uuid).getName());
inProgress.get(uuid).getOwner().sendMessage("challenges.messages.admin.challenge-created", "[challenge]", inProgress.get(uuid).getName());
}
inProgress.remove(uuid);
return status;
Expand All @@ -115,7 +115,7 @@ public boolean onLeft(EntityDamageByEntityEvent e) {
// Prevent damage
e.setCancelled(true);
inProgress.get(player.getUniqueId()).addEntity(e.getEntityType());
User.getInstance(player).sendMessage("challenges.admin.you-added", "[thing]", Util.prettifyText(e.getEntityType().toString()));
User.getInstance(player).sendMessage("challenges.messages.admin.you-added", "[thing]", Util.prettifyText(e.getEntityType().toString()));
return true;
}
return false;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/admin/ImportCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public boolean execute(User user, String label, List<String> args) {
@Override
public void setup() {
this.setPermission("challenges.admin");
this.setParametersHelp("challenges.admin.import.parameters");
this.setDescription("challenges.admin.import.description");
this.setParametersHelp("challenges.commands.admin.import.parameters");
this.setDescription("challenges.commands.admin.import.description");
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public ReloadChallenges(Addon addon, CompositeCommand parent) {
@Override
public void setup() {
this.setPermission("admin.challenges");
this.setParametersHelp("challenges.admin.reload.parameters");
this.setDescription("challenges.admin.reload.description");
this.setParametersHelp("challenges.commands.admin.reload.parameters");
this.setDescription("challenges.commands.admin.reload.description");
manager = ((ChallengesAddon)getAddon()).getChallengesManager();
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/world/bentobox/challenges/commands/admin/ResetChallenge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public ResetChallenge(Addon addon, CompositeCommand parent) {
@Override
public void setup() {
this.setPermission("admin.challenges");
this.setParametersHelp("challenges.admin.reset.parameters");
this.setDescription("challenges.admin.reset.description");
this.setParametersHelp("challenges.commands.admin.reset.parameters");
this.setDescription("challenges.commands.admin.reset.description");
manager = ((ChallengesAddon)getAddon()).getChallengesManager();
}

Expand All @@ -57,7 +57,7 @@ public boolean execute(User user, String label, List<String> args) {
}
// Check for valid challenge name
if (!manager.containsChallenge(args.get(1))) {
user.sendMessage("challenges.admin.complete.unknown-challenge");
user.sendMessage("challenges.errors.unknown-challenge");
return false;
}
// Complete challenge
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/admin/ShowChallenges.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public ShowChallenges(Addon addon, CompositeCommand parent) {
@Override
public void setup() {
this.setPermission("admin.challenges");
this.setParametersHelp("challaneges.admin.show.parameters");
this.setDescription("challenges.admin.show.description");
this.setParametersHelp("challenges.commands.admin.show.parameters");
this.setDescription("challenges.commands.admin.show.description");

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/world/bentobox/challenges/panel/CommonGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public CommonGUI(ChallengesAddon addon,
this.pageIndex = 0;

this.returnButton = new PanelItemBuilder().
name(this.user.getTranslation("challenges.gui.buttons.back")).
name(this.user.getTranslation("challenges.gui.buttons.return")).
icon(Material.OAK_DOOR).
clickHandler((panel, user1, clickType, i) -> {
if (this.parentGUI == null)
Expand Down

0 comments on commit ab3275c

Please sign in to comment.