better claim info message close #160
This commit is contained in:
parent
56cec73cbc
commit
667164f90d
@ -4,6 +4,7 @@ Flan 1.7.10
|
|||||||
Stops unlock cmd message when keep inventory is on
|
Stops unlock cmd message when keep inventory is on
|
||||||
- Fix addClaim cmd bypassing world blacklist
|
- Fix addClaim cmd bypassing world blacklist
|
||||||
- Make admin mode ignore world blacklist
|
- Make admin mode ignore world blacklist
|
||||||
|
- Make claim info message look nicer
|
||||||
|
|
||||||
Flan 1.7.9
|
Flan 1.7.9
|
||||||
================
|
================
|
||||||
|
@ -20,7 +20,9 @@ import io.github.flemmli97.flan.player.PlayerClaimData;
|
|||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
import net.minecraft.network.chat.TextComponent;
|
import net.minecraft.network.chat.TextComponent;
|
||||||
|
import net.minecraft.network.chat.TranslatableComponent;
|
||||||
import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
|
import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
|
||||||
import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
|
import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
@ -803,9 +805,9 @@ public class Claim implements IPermissionContainer {
|
|||||||
}
|
}
|
||||||
if (perms) {
|
if (perms) {
|
||||||
if (infoType == InfoType.ALL || infoType == InfoType.GLOBAL)
|
if (infoType == InfoType.ALL || infoType == InfoType.GLOBAL)
|
||||||
l.add(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("claimInfoPerms"), this.globalPerm), ChatFormatting.RED));
|
l.add(fromPermissionMap("claimInfoPerms", this.globalPerm));
|
||||||
if (infoType == InfoType.ALL || infoType == InfoType.GROUP) {
|
if (infoType == InfoType.ALL || infoType == InfoType.GROUP) {
|
||||||
l.add(PermHelper.simpleColoredText(ConfigHandler.langManager.get("claimGroupInfoHeader"), ChatFormatting.RED));
|
l.add(PermHelper.simpleColoredText(ConfigHandler.langManager.get("claimGroupInfoHeader"), ChatFormatting.GOLD));
|
||||||
Map<String, List<String>> nameToGroup = new HashMap<>();
|
Map<String, List<String>> nameToGroup = new HashMap<>();
|
||||||
for (Map.Entry<UUID, String> e : this.playersGroups.entrySet()) {
|
for (Map.Entry<UUID, String> e : this.playersGroups.entrySet()) {
|
||||||
player.getServer().getProfileCache().get(e.getKey()).ifPresent(pgroup ->
|
player.getServer().getProfileCache().get(e.getKey()).ifPresent(pgroup ->
|
||||||
@ -817,8 +819,8 @@ public class Claim implements IPermissionContainer {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
for (Map.Entry<String, Map<ClaimPermission, Boolean>> e : this.permissions.entrySet()) {
|
for (Map.Entry<String, Map<ClaimPermission, Boolean>> e : this.permissions.entrySet()) {
|
||||||
l.add(PermHelper.simpleColoredText(String.format(" %s:", e.getKey()), ChatFormatting.DARK_RED));
|
l.add(PermHelper.simpleColoredText(String.format(" %s:", e.getKey()), ChatFormatting.YELLOW));
|
||||||
l.add(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("claimGroupPerms"), e.getValue()), ChatFormatting.RED));
|
l.add(fromPermissionMap("claimGroupPerms", e.getValue()));
|
||||||
l.add(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("claimGroupPlayers"), nameToGroup.getOrDefault(e.getKey(), new ArrayList<>())), ChatFormatting.RED));
|
l.add(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("claimGroupPlayers"), nameToGroup.getOrDefault(e.getKey(), new ArrayList<>())), ChatFormatting.RED));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -827,6 +829,20 @@ public class Claim implements IPermissionContainer {
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Component fromPermissionMap(String lang, Map<ClaimPermission, Boolean> map) {
|
||||||
|
MutableComponent mapComp = new TextComponent("[").withStyle(ChatFormatting.GRAY);
|
||||||
|
int i = 0;
|
||||||
|
for (Map.Entry<ClaimPermission, Boolean> entry : map.entrySet()) {
|
||||||
|
MutableComponent pComp = new TextComponent((i != 0 ? ", " : "") + entry.getKey().id + "=").withStyle(ChatFormatting.GRAY);
|
||||||
|
pComp.append(new TextComponent(entry.getValue().toString()).withStyle(entry.getValue() ? ChatFormatting.GREEN : ChatFormatting.RED));
|
||||||
|
mapComp.append(pComp);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
mapComp.append("]");
|
||||||
|
MutableComponent component = new TranslatableComponent(ConfigHandler.langManager.get(lang), mapComp).withStyle(ChatFormatting.DARK_BLUE);
|
||||||
|
return component;
|
||||||
|
}
|
||||||
|
|
||||||
public enum InfoType {
|
public enum InfoType {
|
||||||
ALL,
|
ALL,
|
||||||
SIMPLE,
|
SIMPLE,
|
||||||
|
Loading…
Reference in New Issue
Block a user