Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 2_0_0_multi_island

This commit is contained in:
tastybento 2023-09-03 16:59:10 -07:00
parent 9b56b39647 8d3be9c0ff
commit d92942ea72
2 changed files with 104 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java
View File

@ -2,6 +2,7 @@ package world.bentobox.bentobox.managers;
import java.util.Arrays;
import java.util.Optional;
import java.util.UUID;
import org.bukkit.entity.Player;
import org.eclipse.jdt.annotation.NonNull;
@ -23,6 +24,7 @@ import world.bentobox.bentobox.lists.GameModePlaceholder;
*/
public class PlaceholdersManager {
private static final int MAX_TEAM_MEMBER_PLACEHOLDERS = 50;
private final BentoBox plugin;
public PlaceholdersManager(BentoBox plugin) {
@ -66,6 +68,105 @@ public class PlaceholdersManager {
Arrays.stream(GameModePlaceholder.values())
.filter(placeholder -> !isPlaceholder(addon, placeholder.getPlaceholder()))
.forEach(placeholder -> registerPlaceholder(addon, placeholder.getPlaceholder(), new DefaultPlaceholder(addon, placeholder)));
// Register team member placeholders
registerTeamMemberPlaceholders(addon);
}
private void registerTeamMemberPlaceholders(@NonNull GameModeAddon addon) {
for (int i = 1; i <= MAX_TEAM_MEMBER_PLACEHOLDERS; i++) {
final int count = i;
// Names
registerPlaceholder(addon, "island_member_name_" + i, user -> {
if (user != null) {
Island island = plugin.getIslands().getIsland(addon.getOverWorld(), user);
int j = 1;
for (UUID uuid : island.getMemberSet(RanksManager.MEMBER_RANK)) {
if (j++ == count) {
return plugin.getPlayers().getName(uuid);
}
}
}
return "";
});
// Register ranks
registerPlaceholder(addon, "island_member_rank_" + i, user -> {
if (user != null) {
Island island = plugin.getIslands().getIsland(addon.getOverWorld(), user);
int j = 1;
for (UUID uuid : island.getMemberSet(RanksManager.MEMBER_RANK)) {
if (j++ == count) {
return user.getTranslationOrNothing(plugin.getRanksManager().getRank(island.getRank(uuid)));
}
}
}
return "";
});
// Banned
registerPlaceholder(addon, "island_banned_name_" + i, user -> {
if (user != null) {
Island island = plugin.getIslands().getIsland(addon.getOverWorld(), user);
int j = 1;
for (UUID uuid : island.getBanned()) {
if (j++ == count) {
return plugin.getPlayers().getName(uuid);
}
}
}
return "";
});
// Visited Island
registerPlaceholder(addon, "visited_island_member_name_" + i, user -> {
if (user != null) {
return plugin.getIslands().getIslandAt(user.getLocation())
.filter(island -> addon.inWorld(island.getCenter()))
.map(island -> {
int j = 1;
for (UUID uuid : island.getMemberSet(RanksManager.MEMBER_RANK)) {
if (j++ == count) {
return plugin.getPlayers().getName(uuid);
}
}
return "";
}).orElse("");
}
return "";
});
registerPlaceholder(addon, "visited_island_member_rank_" + i, user -> {
if (user != null) {
return plugin.getIslands().getIslandAt(user.getLocation())
.filter(island -> addon.inWorld(island.getCenter()))
.map(island -> {
int j = 1;
for (UUID uuid : island.getMemberSet(RanksManager.MEMBER_RANK)) {
if (j++ == count) {
return user.getTranslationOrNothing(plugin.getRanksManager().getRank(island.getRank(uuid)));
}
}
return "";
}).orElse("");
}
return "";
});
registerPlaceholder(addon, "visited_island_banned_name_" + i, user -> {
if (user != null) {
return plugin.getIslands().getIslandAt(user.getLocation())
.filter(island -> addon.inWorld(island.getCenter()))
.map(island -> {
int j = 1;
for (UUID uuid : island.getBanned()) {
if (j++ == count) {
return plugin.getPlayers().getName(uuid);
}
}
return "";
}).orElse("");
}
return "";
});
}
}
/**

5
src/test/java/world/bentobox/bentobox/managers/PlaceholdersManagerTest.java
View File

@ -76,7 +76,8 @@ public class PlaceholdersManagerTest {
@Test
public void testRegisterGameModePlaceholdersAllDefaults() {
pm.registerDefaultPlaceholders(addon);
verify(hook, times(GameModePlaceholder.values().length)).registerPlaceholder(any(), anyString(), any());
// + 300 because we register team member placeholders up to 50 members
verify(hook, times(GameModePlaceholder.values().length + 300)).registerPlaceholder(any(), anyString(), any());
}
/**
@ -90,6 +91,6 @@ public class PlaceholdersManagerTest {
pm.registerDefaultPlaceholders(addon);
// 3 less registrations for this addon
verify(hook, times(GameModePlaceholder.values().length - 3)).registerPlaceholder(any(), anyString(), any());
verify(hook, times(GameModePlaceholder.values().length - 3 + 300)).registerPlaceholder(any(), anyString(), any());
}
}