Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

first test

Browse Source
This commit is contained in:
AlexDev_ 2023-10-16 15:55:17 +02:00
parent c8af05d9be
commit 1be3c47d9c
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/william278/velocitab/config/Formatter.java
View File

@ -43,7 +43,7 @@ public enum Formatter {
MINIMESSAGE( MINIMESSAGE(
(text, player, plugin) -> plugin.getMiniPlaceholdersHook() (text, player, plugin) -> plugin.getMiniPlaceholdersHook()
.map(hook -> hook.format(text, player.getPlayer())) .map(hook -> hook.format(text, player.getPlayer()))
.orElse(MiniMessage.miniMessage().deserialize(text)), .orElse(MiniMessage.miniMessage().deserialize(parseSections(text))),
(text) -> MiniMessage.miniMessage().escapeTags(text), (text) -> MiniMessage.miniMessage().escapeTags(text),
"MiniMessage" "MiniMessage"
), ),
@ -94,4 +94,26 @@ public enum Formatter {
return name; return name;
} }
private static String replaceAmpersandCodesWithSection(String text) {
char[] b = text.toCharArray();
for (int i = 0; i < b.length - 1; i++) {
if (b[i] == '&' && "0123456789AaBbCcDdEeFfKkLlMmNnOoRrXx#".indexOf(b[i + 1]) > -1) {
b[i] = '§';
b[i + 1] = Character.toLowerCase(b[i + 1]);
}
}
return new String(b);
}
public static String parseSections(String text) {
String value = MiniMessage.miniMessage().serialize(
LegacyComponentSerializer.legacySection().deserialize(
replaceAmpersandCodesWithSection(text)))
.replace("\\<", "<");
return MiniMessage.miniMessage().serialize(
LegacyComponentSerializer.legacySection().deserialize(
replaceAmpersandCodesWithSection(text)))
.replace("\\<", "<");
}
} }

3
src/main/java/net/william278/velocitab/hook/MiniPlaceholdersHook.java
View File

@ -24,6 +24,7 @@ import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.william278.velocitab.Velocitab; import net.william278.velocitab.Velocitab;
import net.william278.velocitab.config.Formatter;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class MiniPlaceholdersHook extends Hook { public class MiniPlaceholdersHook extends Hook {
@ -34,7 +35,7 @@ public class MiniPlaceholdersHook extends Hook {
@NotNull @NotNull
public Component format(@NotNull String text, @NotNull Audience player) { public Component format(@NotNull String text, @NotNull Audience player) {
return MiniMessage.miniMessage().deserialize(text, MiniPlaceholders.getAudienceGlobalPlaceholders(player)); return MiniMessage.miniMessage().deserialize(Formatter.parseSections(text), MiniPlaceholders.getAudienceGlobalPlaceholders(player));
} }
} }

8
src/main/java/net/william278/velocitab/packet/UpdateTeamsPacket.java
View File

@ -69,7 +69,7 @@ public class UpdateTeamsPacket implements MinecraftPacket {
.mode(UpdateMode.CREATE_TEAM) .mode(UpdateMode.CREATE_TEAM)
.displayName(displayName) .displayName(displayName)
.friendlyFlags(List.of(FriendlyFlag.CAN_HURT_FRIENDLY)) .friendlyFlags(List.of(FriendlyFlag.CAN_HURT_FRIENDLY))
.nameTagVisibility(NameTagVisibility.ALWAYS) .nameTagVisibility(isNametagPresent(prefix, suffix) ? NameTagVisibility.ALWAYS : NameTagVisibility.NEVER)
.collisionRule(CollisionRule.ALWAYS) .collisionRule(CollisionRule.ALWAYS)
.color(getLastColor(prefix)) .color(getLastColor(prefix))
.prefix(prefix == null ? "" : prefix) .prefix(prefix == null ? "" : prefix)
@ -77,6 +77,10 @@ public class UpdateTeamsPacket implements MinecraftPacket {
.entities(Arrays.asList(teamMembers)); .entities(Arrays.asList(teamMembers));
} }
private static boolean isNametagPresent(@Nullable String prefix, @Nullable String suffix) {
return prefix != null && !prefix.isEmpty() || suffix != null && !suffix.isEmpty();
}
@NotNull @NotNull
protected static UpdateTeamsPacket changeNameTag(@NotNull Velocitab plugin, @NotNull String teamName, protected static UpdateTeamsPacket changeNameTag(@NotNull Velocitab plugin, @NotNull String teamName,
@Nullable String prefix, @Nullable String suffix) { @Nullable String prefix, @Nullable String suffix) {
@ -85,7 +89,7 @@ public class UpdateTeamsPacket implements MinecraftPacket {
.mode(UpdateMode.UPDATE_INFO) .mode(UpdateMode.UPDATE_INFO)
.displayName(teamName) .displayName(teamName)
.friendlyFlags(List.of(FriendlyFlag.CAN_HURT_FRIENDLY)) .friendlyFlags(List.of(FriendlyFlag.CAN_HURT_FRIENDLY))
.nameTagVisibility(NameTagVisibility.ALWAYS) .nameTagVisibility(isNametagPresent(prefix, suffix) ? NameTagVisibility.ALWAYS : NameTagVisibility.NEVER)
.collisionRule(CollisionRule.ALWAYS) .collisionRule(CollisionRule.ALWAYS)
.color(getLastColor(prefix)) .color(getLastColor(prefix))
.prefix(prefix == null ? "" : prefix) .prefix(prefix == null ? "" : prefix)