Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replaced "N/A" instances with nullPlaceholder config #819

Merged
merged 3 commits into from
May 10, 2024
Merged

replaced "N/A" instances with nullPlaceholder config #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37fd113
replaced "N/A" instances with nullPlaceholder config
sh0inx Mar 3, 2024
a592ff2
Merge branch 'master' into translation-extras
sh0inx Mar 16, 2024
ec9cb51
Merge branch 'master' into translation-extras
PeachesMLG May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/iridium/iridiumskyblock/database/Island.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void setColor(Color color) {
if (super.getName() != null) return super.getName();
String ownerName = getOwner()
.map(User::getName)
.orElse("N/A");
.orElse(IridiumSkyblock.getInstance().getMessages().nullPlaceholder);
return IridiumSkyblock.getInstance().getConfiguration().defaultIslandName.replace("%owner%", ownerName);
}

Expand Down
36 changes: 18 additions & 18 deletions src/main/java/com/iridium/iridiumskyblock/placeholders/IslandPlaceholderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public List<Placeholder> getPlaceholders(Island island) {
.filter(user -> user.getUserRank() == Rank.OWNER.getId())
.findFirst()
.map(User::getName)
.orElse("N/A")),
.orElse(IridiumSkyblock.getInstance().getMessages().nullPlaceholder)),
new Placeholder("island_create", island.getCreateTime().format(DateTimeFormatter.ofPattern(IridiumSkyblock.getInstance().getConfiguration().dateTimeFormat))),
new Placeholder("island_description", island.getDescription()),
new Placeholder("island_value", String.valueOf(IridiumSkyblock.getInstance().getTeamManager().getTeamValue(island))),
Expand Down Expand Up @@ -72,29 +72,29 @@ public List<Placeholder> getPlaceholders(Island island) {

private List<Placeholder> initializeDefaultPlaceholders() {
List<Placeholder> placeholderList = new ArrayList<>(Arrays.asList(
new Placeholder("island_name", "N/A"),
new Placeholder("island_owner", "N/A"),
new Placeholder("island_description", "N/A"),
new Placeholder("island_create", "N/A"),
new Placeholder("island_value", "N/A"),
new Placeholder("island_level", "N/A"),
new Placeholder("island_experience", "N/A"),
new Placeholder("island_value_rank", "N/A"),
new Placeholder("island_experience_rank", "N/A"),
new Placeholder("island_members_online", "N/A"),
new Placeholder("island_members_online_count", "N/A"),
new Placeholder("island_members_offline", "N/A"),
new Placeholder("island_members_offline_count", "N/A"),
new Placeholder("island_members_count", "N/A")
new Placeholder("island_name", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_owner", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_description", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_create", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_value", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_level", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_experience", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_value_rank", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_experience_rank", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_members_online", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_members_online_count", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_members_offline", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_members_offline_count", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("island_members_count", IridiumSkyblock.getInstance().getMessages().nullPlaceholder)
));
for (BankItem bankItem : IridiumSkyblock.getInstance().getBankItemList()) {
placeholderList.add(new Placeholder("island_bank_" + bankItem.getName().toLowerCase(), "N/A"));
placeholderList.add(new Placeholder("island_bank_" + bankItem.getName().toLowerCase(), IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
}
for (XMaterial xMaterial : XMaterial.values()) {
placeholderList.add(new Placeholder("island_" + xMaterial.name().toLowerCase() + "_amount", "N/A"));
placeholderList.add(new Placeholder("island_" + xMaterial.name().toLowerCase() + "_amount", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
}
for (EntityType entityType : EntityType.values()) {
placeholderList.add(new Placeholder("island_" + entityType.name().toLowerCase() + "_amount", "N/A"));
placeholderList.add(new Placeholder("island_" + entityType.name().toLowerCase() + "_amount", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
}
return placeholderList;
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/iridium/iridiumskyblock/placeholders/UserPlaceholderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
public class UserPlaceholderBuilder implements PlaceholderBuilder<User> {
private final TemporaryCache<User, List<Placeholder>> cache = new TemporaryCache<>();
private final List<Placeholder> defaultPlaceholders = Arrays.asList(
new Placeholder("player_rank", "N/A"),
new Placeholder("player_name", "N/A"),
new Placeholder("player_join", "N/A")
new Placeholder("player_rank", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("player_name", IridiumSkyblock.getInstance().getMessages().nullPlaceholder),
new Placeholder("player_join", IridiumSkyblock.getInstance().getMessages().nullPlaceholder)
);

@Override
public List<Placeholder> getPlaceholders(User user) {
return cache.get(user, Duration.ofSeconds(1), () -> Arrays.asList(
new Placeholder("player_rank", IridiumSkyblock.getInstance().getUserRanks().getOrDefault(user.getUserRank(), new UserRank("N/A", null)).name),
new Placeholder("player_rank", IridiumSkyblock.getInstance().getUserRanks().getOrDefault(user.getUserRank(), new UserRank(IridiumSkyblock.getInstance().getMessages().nullPlaceholder, null)).name),
new Placeholder("player_name", user.getName()),
new Placeholder("player_join", user.getJoinTime().format(DateTimeFormatter.ofPattern(IridiumSkyblock.getInstance().getConfiguration().dateTimeFormat)))
));
Expand Down
Loading