Freezy-Studios/BlazeSMP
1
0
Fork 0
mirror of https://github.com/Freezy-Studios/BlazeSMP.git synced 2025-04-21 15:14:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix click event in messages

Browse source
This commit is contained in:
DaTTV 2025-02-26 17:18:24 +01:00
parent 2f6a9051af
commit 727ac2651d
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
View file

@ -7,7 +7,6 @@ import me.freezy.plugins.papermc.blazesmp.module.manager.Clans;
import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4; import me.freezy.plugins.papermc.blazesmp.module.manager.L4M4;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.format.TextDecoration;
import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -20,6 +19,8 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
public class ClanCommand extends SimpleCommand { public class ClanCommand extends SimpleCommand {
private final Clans clans; private final Clans clans;
@ -66,7 +67,8 @@ public class ClanCommand extends SimpleCommand {
} }
String clanName = args[1]; String clanName = args[1];
String clanTag = String.join(" ", Arrays.copyOfRange(args, 2, args.length)); String clanTag = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
Component tagComponent = miniMessage().deserialize(clanTag); String formattedMessage = clanTag.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
Component tagComponent = miniMessage().deserialize(formattedMessage);
Clan newClan = new Clan(clanName, tagComponent, playerUUID); Clan newClan = new Clan(clanName, tagComponent, playerUUID);
clans.addClan(newClan); clans.addClan(newClan);
@ -678,6 +680,7 @@ public class ClanCommand extends SimpleCommand {
} }
String whatToModify = args[1].toLowerCase(); String whatToModify = args[1].toLowerCase();
String newValue = String.join(" ", Arrays.copyOfRange(args, 2, args.length)); String newValue = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
String formattedMessage = newValue.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
Clan currentClan = clans.getClanByMember(playerUUID); Clan currentClan = clans.getClanByMember(playerUUID);
if (currentClan == null) { if (currentClan == null) {
player.sendMessage(miniMessage().deserialize(L4M4.get("error.clan_not_found"))); player.sendMessage(miniMessage().deserialize(L4M4.get("error.clan_not_found")));
@ -692,11 +695,11 @@ public class ClanCommand extends SimpleCommand {
)); ));
} }
case "tag" -> { case "tag" -> {
Component newTag = miniMessage().deserialize(newValue); Component newTag = miniMessage().deserialize(formattedMessage);
currentClan.setTag(newTag); currentClan.setTag(newTag);
currentClan.save(); currentClan.save();
player.sendMessage(miniMessage().deserialize( player.sendMessage(miniMessage().deserialize(
String.format("<green>Clan tag changed to %s.</green>", newValue) String.format("<green>Clan tag changed to %s.</green>", formattedMessage)
)); ));
} }
default -> player.sendMessage(miniMessage().deserialize(L4M4.get("error.modify_invalid"))); default -> player.sendMessage(miniMessage().deserialize(L4M4.get("error.modify_invalid")));
@ -778,7 +781,8 @@ public class ClanCommand extends SimpleCommand {
.filter(s -> s.startsWith(args[1])) .filter(s -> s.startsWith(args[1]))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
default -> {} default -> {
}
} }
} else if (clans.isVice(playerUUID)) { } else if (clans.isVice(playerUUID)) {
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
@ -809,7 +813,8 @@ public class ClanCommand extends SimpleCommand {
List<String> joins = getClanJoinRequests(args, playerUUID); List<String> joins = getClanJoinRequests(args, playerUUID);
if (joins != null) return joins; if (joins != null) return joins;
} }
default -> {} default -> {
}
} }
} else { } else {
switch (args[0].toLowerCase()) { switch (args[0].toLowerCase()) {
@ -829,7 +834,8 @@ public class ClanCommand extends SimpleCommand {
case "create" -> { case "create" -> {
return Collections.singletonList("<name>"); return Collections.singletonList("<name>");
} }
default -> {} default -> {
}
} }
} }
} }

5
src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
View file

@ -13,7 +13,10 @@ public class PlayerChatListener implements Listener {
public void onChat(AsyncChatEvent event) { public void onChat(AsyncChatEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Component messageComponent = MiniMessage.miniMessage().deserialize(PlainTextComponentSerializer.plainText().serialize(event.message())); String message = PlainTextComponentSerializer.plainText().serialize(event.message());
String formattedMessage = message.replaceAll("<click:[^>]+>(.*?)</click>", "$1");
Component messageComponent = MiniMessage.miniMessage().deserialize(formattedMessage);
Component chatComponent = Component.empty() Component chatComponent = Component.empty()
.append(player.playerListName()) .append(player.playerListName())