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

Moe WIP on team GUI

This commit is contained in:
tastybento 2023-12-26 16:54:43 +09:00
parent efa055bf36
commit bac0fe4b17
4 changed files with 89 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
View File

@ -6,6 +6,7 @@ import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@ -22,6 +23,7 @@ import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.api.events.team.TeamEvent;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.panels.Panel;
import world.bentobox.bentobox.api.panels.PanelItem;
import world.bentobox.bentobox.api.panels.TemplatedPanel;
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
@ -130,13 +132,33 @@ public class IslandTeamCommand extends CompositeCommand {
panelBuilder.registerTypeBuilder("STATUS", this::createStatusButton);
panelBuilder.registerTypeBuilder("MEMBER", this::createMemberButton);
//panelBuilder.registerTypeBuilder("INVITE", this::createInviteButton);
panelBuilder.registerTypeBuilder("INVITE", this::createInviteButton);
//panelBuilder.registerTypeBuilder("KICK", this::createKickButton);
// Register unknown type builder.
panelBuilder.build();
}
/**
* Create invite button panel item.
*
* @param template the template
* @param slot the slot
* @return the panel item
*/
private PanelItem createInviteButton(ItemTemplateRecord template, TemplatedPanel.ItemSlot slot) {
PanelItemBuilder builder = new PanelItemBuilder();
// Player issuing the command must have an island
Island island = getIslands().getPrimaryIsland(getWorld(), user.getUniqueId());
if (island == null) {
return builder.icon(Material.BARRIER).name(user.getTranslation("general.errors.no-island")).build();
}
// The player must be able to invite a player
return builder.icon(user.getName()).name(user.getTranslation("commands.island.team.gui.buttons.status.name"))
.description(showMembers()).build();
}
/**
* Create status button panel item.
*
@ -164,11 +186,11 @@ public class IslandTeamCommand extends CompositeCommand {
* @return the panel item
*/
private PanelItem createMemberButton(ItemTemplateRecord template, TemplatedPanel.ItemSlot slot) {
PanelItemBuilder builder = new PanelItemBuilder();
// Player issuing the command must have an island
Island island = getIslands().getPrimaryIsland(getWorld(), user.getUniqueId());
if (island == null) {
return builder.icon(Material.BARRIER).name(user.getTranslation("general.errors.no-island")).build();
return new PanelItemBuilder().icon(Material.BARRIER).name(user.getTranslation("general.errors.no-island"))
.build();
}
if (slot.slot() == 0 && island.getOwner() != null) {
// Owner
@ -182,7 +204,6 @@ public class IslandTeamCommand extends CompositeCommand {
long memberCount = island.getMemberSet(RanksManager.MEMBER_RANK, false).stream().count();
long coopCount = island.getMemberSet(RanksManager.COOP_RANK, false).stream().count();
long trustedCount = island.getMemberSet(RanksManager.TRUSTED_RANK, false).stream().count();
BentoBox.getInstance().logDebug("Slot = " + slot.slot());
if (slot.slot() > 0 && slot.slot() < subOwnerCount + 1) {
// Show sub owners
@ -220,11 +241,10 @@ public class IslandTeamCommand extends CompositeCommand {
}
}
return builder.icon(Material.BLACK_STAINED_GLASS_PANE).name("&b&r").build();
return new PanelItemBuilder().icon(Material.BLACK_STAINED_GLASS_PANE).name("&b&r").build();
}
private PanelItem getMemberButton(String ref, int rank, long count, int slot, List<ActionRecords> actions) {
BentoBox.getInstance().logDebug(ref + " " + rank + " count = " + count + " slot = " + slot);
User player = island.getMemberSet(rank, false).stream().sorted().skip(slot - 1).limit(1L)
.map(User::getInstance).findFirst().orElse(null);
if (player != null) {
@ -232,28 +252,42 @@ public class IslandTeamCommand extends CompositeCommand {
return new PanelItemBuilder().icon(player.getName()).name(player.getDisplayName())
.description(user.getTranslation("commands.island.team.info.rank-layout.generic",
TextVariables.RANK, user.getTranslation(ref), TextVariables.NUMBER, String.valueOf(count)))
.clickHandler((panel, user, clickType, i) -> {
BentoBox.getInstance().logDebug("Clicked " + clickType);
actions.forEach(ar -> BentoBox.getInstance().logDebug(ar.content() + " " + ar.clickType()));
return true;
})
.clickHandler(
(panel, user, clickType, i) -> clickListener(panel, user, clickType, i, player, actions))
.build();
} else {
// Offline player
return new PanelItemBuilder().icon(player.getName()).name(player.getDisplayName())
.description(offlinePlayerStatus(user, Bukkit.getOfflinePlayer(player.getUniqueId())))
.clickHandler((panel, user, clickType, i) -> {
BentoBox.getInstance().logDebug("Clicked " + clickType);
actions.forEach(ar -> BentoBox.getInstance().logDebug(ar.content() + " " + ar.clickType()));
return true;
}).build();
.clickHandler((panel, user, clickType, i) -> clickListener(panel, user, clickType, i, player,
actions))
.build();
}
} else {
BentoBox.getInstance().logDebug("no player found");
}
return null;
}
private boolean clickListener(Panel panel, User user, ClickType clickType, int i, User player,
List<ActionRecords> actions) {
for (ItemTemplateRecord.ActionRecords action : actions) {
if (clickType == action.clickType() || action.clickType() == ClickType.UNKNOWN) {
switch (action.actionType().toUpperCase(Locale.ENGLISH)) {
case "KICK" -> {
// Kick the player
if (!player.equals(user)) {
this.user.closeInventory();
BentoBox.getInstance()
.logDebug(this.getTopLabel() + " " + this.getLabel() + " kick " + player.getName());
user.performCommand(this.getTopLabel() + " " + this.getLabel() + " kick " + player.getName());
}
}
}
}
}
return true;
}
private List<String> showMembers() {
List<String> message = new ArrayList<>();
// Gather online members
@ -308,6 +342,12 @@ public class IslandTeamCommand extends CompositeCommand {
}
}
/**
* Creates text to describe the status of the player
* @param user2 user asking to see the status
* @param offlineMember member of the team
* @return string
*/
private String offlinePlayerStatus(User user2, OfflinePlayer offlineMember) {
// A bit of handling for the last joined date
Instant lastJoined = Instant.ofEpochMilli(offlineMember.getLastPlayed());

18
src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java
View File

@ -73,6 +73,22 @@ public record ItemTemplateRecord(@Nullable ItemStack icon, @Nullable String titl
* @param content the content of the action
* @param tooltip the tooltip of action
*/
public record ActionRecords(ClickType clickType, String actionType, String content, String tooltip) {
public record ActionRecords(
/**
* the click type
*/
ClickType clickType,
/**
* the string that represents action type
*/
String actionType,
/**
* the content of the action
*/
String content,
/**
* the tooltip of action
*/
String tooltip) {
}
}

2
src/main/resources/locales/en-US.yml
View File

@ -621,6 +621,8 @@ commands:
description: The status of the team
tips:
click-to-view: Click to view
right-click-to-kick: Right click to kick player - requires confirmation
click-to-invite: Click to invite a team member
info:
description: display detailed info about your team
member-layout:

16
src/main/resources/panels/team_panel.yml
View File

@ -37,6 +37,14 @@ team_panel:
click-type: UNKNOWN
# tooltip is a locale reference that will be translated for the user and shown when they hover over the button.
tooltip: commands.island.team.gui.tips.click-to-view
4:
# Invite member
data:
type: INVITE
actions:
add:
click-type: LEFT
tooltip: commands.island.team.gui.tips.click-to-invite
2:
2: member_button
3: member_button
@ -77,7 +85,7 @@ team_panel:
6: member_button
7: member_button
8: member_button
# This is where reuable buttons are defined.
# This is where reusable buttons are defined.
reusable:
# This is the name of the button that is referenced
member_button:
@ -85,15 +93,15 @@ team_panel:
# icons are usually not defined if the icon is going to be dynamically set in the panel, e.g. in this case the material will vary
#icon: STONE
title: commands.island.team.gui.buttons.member.name
description: levcommands.island.team.gui.buttons.member.description
description: commands.island.team.gui.buttons.member.description
data:
type: MEMBER
# Actions cover what happens if the button is clicked or the mouse is moved over it. There can be multiple actions possible for different
# click-types.
actions:
# Each action has an arbitrary descriptive name to define it.
view:
kick:
# The click-type is the same as the bukkit {@link org.bukkit.event.inventory.ClickType}. UNKNOWN is the default.
click-type: RIGHT_CLICK
click-type: RIGHT
# tooltip is a locale reference that will be translated for the user and shown when they hover over the button.
tooltip: commands.island.team.gui.tips.right-click-to-kick