Skip to content

Commit

Permalink
Changes User#sendMessage to Utils#sendMessage
Browse files Browse the repository at this point in the history 
This allows add "prefix" to all messages send from Challenges addon.
  • Loading branch information
@BONNe
BONNe committed Sep 19, 2021
1 parent 99c920f commit 6fbc9d0
Show file tree
Hide file tree
Showing 9 changed files with 134 additions and 121 deletions.
7 changes: 5 additions & 2 deletions src/main/java/world/bentobox/challenges/commands/ChallengesPlayerCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ public boolean canExecute(User user, String label, List<String> args)
map(GameModeAddon::getAdminCommand).
map(optionalAdminCommand -> optionalAdminCommand.map(CompositeCommand::getTopLabel).orElse(this.getTopLabel())).
orElse(this.getTopLabel());
user.sendMessage("challenges.errors.no-challenges-admin", "[command]", topLabel + " challenges");
Utils.sendMessage(user, user.getTranslation("challenges.errors.no-challenges-admin",
"[command]",
topLabel + " " + this.<ChallengesAddon>getAddon().getChallengesSettings().getAdminMainCommand().split(" ")[0]));

}
else
{
user.sendMessage("challenges.errors.no-challenges");
Utils.sendMessage(user, user.getTranslation("challenges.errors.no-challenges"));
}

return false;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/world/bentobox/challenges/commands/CompleteChallengeCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public boolean execute(User user, String label, List<String> args)
{
if (args.isEmpty())
{
user.sendMessage("challenges.errors.no-name");
Utils.sendMessage(user, user.getTranslation("challenges.errors.no-name"));
this.showHelp(this, user);
return false;
}
Expand All @@ -74,7 +74,7 @@ public boolean execute(User user, String label, List<String> args)

if (!canMultipleTimes && count > 1)
{
user.sendMessage("challenges.error.no-multiple-permission");
Utils.sendMessage(user, user.getTranslation("challenges.error.no-multiple-permission"));
count = 1;
}

Expand All @@ -88,7 +88,7 @@ public boolean execute(User user, String label, List<String> args)
}
else
{
user.sendMessage("challenges.errors.unknown-challenge");
Utils.sendMessage(user, user.getTranslation("challenges.errors.unknown-challenge"));
this.showHelp(this, user);
return false;
}
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public boolean execute(User user, String label, List<String> args)
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.no-name");
Utils.sendMessage(user, user.getTranslation("challenges.errors.no-name"));
}
else
{
Expand All @@ -68,7 +68,7 @@ else if (args.size() < 2)
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.missing-arguments");
Utils.sendMessage(user, user.getTranslation("challenges.errors.missing-arguments"));
}
else
{
Expand All @@ -83,9 +83,9 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("general.errors.unknown-player",
Utils.sendMessage(user, user.getTranslation("general.errors.unknown-player",
TextVariables.NAME,
args.get(0));
args.get(0)));
}
else
{
Expand All @@ -108,9 +108,9 @@ else if (!args.get(1).isEmpty())

if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.completed",
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.completed",
"[name]", challenge.getFriendlyName(),
"[player]", User.getInstance(targetUUID).getName());
"[player]", User.getInstance(targetUUID).getName()));
}
else
{
Expand All @@ -122,7 +122,7 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.already-completed");
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.already-completed"));
}
else
{
Expand All @@ -136,7 +136,7 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.unknown-challenge");
Utils.sendMessage(user, user.getTranslation("challenges.errors.unknown-challenge"));
}
else
{
Expand Down Expand Up @@ -195,5 +195,5 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
/**
* Variable that holds challenge addon. Single casting.
*/
private ChallengesAddon addon;
private final ChallengesAddon addon;
}
5 changes: 3 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 @@ -7,6 +7,7 @@
import world.bentobox.bentobox.api.user.User;
import world.bentobox.challenges.ChallengesAddon;
import world.bentobox.challenges.managers.ChallengesManager;
import world.bentobox.challenges.utils.Utils;


/**
Expand Down Expand Up @@ -46,13 +47,13 @@ public boolean execute(User user, String label, List<String> args)
if (args.isEmpty())
{
this.manager.load();
user.sendMessage("general.success");
Utils.sendMessage(user, user.getTranslation("general.success"));
return true;
}
else if (args.get(0).equalsIgnoreCase("hard"))
{
this.manager.reload();
user.sendMessage("general.success");
Utils.sendMessage(user, user.getTranslation("general.success"));
return true;
}
else
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/world/bentobox/challenges/commands/admin/ResetCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public boolean execute(User user, String label, List<String> args)
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.no-name");
Utils.sendMessage(user, user.getTranslation("challenges.errors.no-name"));
}
else
{
Expand All @@ -68,7 +68,7 @@ else if (args.size() < 2)
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.missing-arguments");
Utils.sendMessage(user, user.getTranslation("challenges.errors.missing-arguments"));
}
else
{
Expand All @@ -83,7 +83,8 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
Utils.sendMessage(user, user.getTranslation("general.errors.unknown-player",
TextVariables.NAME, args.get(0)));
}
else
{
Expand All @@ -101,8 +102,8 @@ else if (!args.get(1).isEmpty())

if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.reset-all",
"[player]", User.getInstance(targetUUID).getName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.reset-all",
"[player]", User.getInstance(targetUUID).getName()));
}
else
{
Expand All @@ -125,9 +126,9 @@ else if (!args.get(1).isEmpty())

if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.reset",
"[name]", challenge.getFriendlyName(),
"[player]", User.getInstance(targetUUID).getName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.reset",
"[name]", challenge.getFriendlyName(),
"[player]", User.getInstance(targetUUID).getName()));
}
else
{
Expand All @@ -139,7 +140,7 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.not-completed");
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.not-completed"));
}
else
{
Expand All @@ -153,7 +154,7 @@ else if (!args.get(1).isEmpty())
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.unknown-challenge");
Utils.sendMessage(user, user.getTranslation("challenges.errors.unknown-challenge"));
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/world/bentobox/challenges/managers/ChallengesImportManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ public void loadDownloadedChallenges(User user, World world, String downloadStri
{
if (user.isPlayer())
{
user.sendMessage("challenges.errors.exist-challenges-or-levels");
Utils.sendMessage(user, user.getTranslation("challenges.errors.exist-challenges-or-levels"));
}
else
{
Expand Down
43 changes: 23 additions & 20 deletions src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public boolean loadChallenge(@Nullable Challenge challenge,
{
if (!silent)
{
user.sendMessage("load-error", "[value]", "NULL");
Utils.sendMessage(user, user.getTranslation("load-error", "[value]", "NULL"));
}

return false;
Expand All @@ -275,7 +275,8 @@ public boolean loadChallenge(@Nullable Challenge challenge,
{
if (!silent)
{
user.sendMessage("challenges.errors.invalid-challenge", "[challenge]", challenge.getUniqueId());
Utils.sendMessage(user, user.getTranslation("challenges.errors.invalid-challenge",
"[challenge]", challenge.getUniqueId()));
}

this.addon.logWarning("Data for challenge `" + challenge.getUniqueId() + "` is not valid. It could be NULL element in item-stack!");
Expand All @@ -290,8 +291,8 @@ public boolean loadChallenge(@Nullable Challenge challenge,
{
if (!silent)
{
user.sendMessage("challenges.messages.load-skipping",
VALUE, challenge.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-skipping",
VALUE, challenge.getFriendlyName()));
}

return false;
Expand All @@ -300,17 +301,17 @@ public boolean loadChallenge(@Nullable Challenge challenge,
{
if (!silent)
{
user.sendMessage("challenges.messages.load-overwriting",
VALUE, challenge.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-overwriting",
VALUE, challenge.getFriendlyName()));
}
}
}
else
{
if (!silent)
{
user.sendMessage("challenges.messages.load-add",
VALUE, challenge.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-add",
VALUE, challenge.getFriendlyName()));
}
}

Expand Down Expand Up @@ -351,7 +352,7 @@ public boolean loadLevel(@Nullable ChallengeLevel level,
{
if (!silent)
{
user.sendMessage("load-error", "[value]", "NULL");
Utils.sendMessage(user, user.getTranslation("load-error", "[value]", "NULL"));
}

return false;
Expand All @@ -361,7 +362,8 @@ public boolean loadLevel(@Nullable ChallengeLevel level,
{
if (!silent)
{
user.sendMessage("challenges.errors.invalid-level", "[level]", level.getUniqueId());
Utils.sendMessage(user, user.getTranslation("challenges.errors.invalid-level",
"[level]", level.getUniqueId()));
}

this.addon.logWarning("Data for level `" + level.getUniqueId() + "` is not valid. It could be NULL element in item-stack!");
Expand All @@ -372,7 +374,8 @@ public boolean loadLevel(@Nullable ChallengeLevel level,
{
if (user != null)
{
user.sendMessage("challenges.errors.load-error", VALUE, level.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.errors.load-error",
VALUE, level.getFriendlyName()));
}
else
{
Expand All @@ -388,8 +391,8 @@ public boolean loadLevel(@Nullable ChallengeLevel level,
{
if (!silent)
{
user.sendMessage("challenges.messages.load-skipping",
VALUE, level.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-skipping",
VALUE, level.getFriendlyName()));
}

return false;
Expand All @@ -398,17 +401,17 @@ public boolean loadLevel(@Nullable ChallengeLevel level,
{
if (!silent)
{
user.sendMessage("challenges.messages.load-overwriting",
VALUE, level.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-overwriting",
VALUE, level.getFriendlyName()));
}
}
}
else
{
if (!silent)
{
user.sendMessage("challenges.messages.load-add",
VALUE, level.getFriendlyName());
Utils.sendMessage(user, user.getTranslation("challenges.messages.load-add",
VALUE, level.getFriendlyName()));
}
}

Expand Down Expand Up @@ -670,7 +673,7 @@ public void migrateDatabase(User user, World world)

if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.migrate-start");
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.migrate-start"));
}
else
{
Expand All @@ -686,7 +689,7 @@ public void migrateDatabase(User user, World world)

if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.migrate-end");
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.migrate-end"));
}
else
{
Expand All @@ -697,7 +700,7 @@ public void migrateDatabase(User user, World world)
{
if (user.isPlayer())
{
user.sendMessage("challenges.messages.admin.migrate-not");
Utils.sendMessage(user, user.getTranslation("challenges.messages.admin.migrate-not"));
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/world/bentobox/challenges/panel/user/ChallengesPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import world.bentobox.challenges.tasks.TryToComplete;
import world.bentobox.challenges.utils.Constants;
import world.bentobox.challenges.utils.LevelStatus;
import world.bentobox.challenges.utils.Utils;


/**
Expand Down Expand Up @@ -74,7 +75,7 @@ protected void build()
if (!this.containsChallenges)
{
this.addon.logError("There are no challenges set up!");
this.user.sendMessage(Constants.ERRORS + "no-challenges");
Utils.sendMessage(user, user.getTranslation(Constants.ERRORS + "no-challenges"));
return;
}

Expand Down

0 comments on commit 6fbc9d0

Please sign in to comment.