Skip to content

Commit 4e4d5bc

Browse files
committed
add %kitname% placeholder support to kit load broadcast messages
1 parent 3303a4b commit 4e4d5bc

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

src/main/java/dev/noah/perplayerkit/KitManager.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ private boolean loadKitInternal(Player player, String kitId, String notFoundMess
336336

337337
public boolean loadKit(Player player, int slot) {
338338
return loadKitInternal(player, IDUtil.getPlayerKitId(player.getUniqueId(), slot), "Kit " + slot + " does not exist!", false, () -> {
339-
BroadcastManager.get().broadcastPlayerLoadedPrivateKit(player);
339+
BroadcastManager.get().broadcastPlayerLoadedPrivateKit(player, "Kit " + slot);
340340
player.sendMessage(ChatColor.GREEN + "Kit " + slot + " loaded!");
341341
lastKitUsedByPlayer.put(player.getUniqueId(), slot);
342342
});
@@ -347,8 +347,13 @@ public boolean loadKitSilent(Player player, int slot) {
347347
}
348348

349349
public boolean loadPublicKit(Player player, String id) {
350+
String kitDisplayName = publicKitList.stream()
351+
.filter(k -> k.id.equals(id))
352+
.map(k -> k.name)
353+
.findFirst()
354+
.orElse(id);
350355
return loadKitInternal(player, IDUtil.getPublicKitId(id), "Kit does not exist!", false, () -> {
351-
BroadcastManager.get().broadcastPlayerLoadedPublicKit(player);
356+
BroadcastManager.get().broadcastPlayerLoadedPublicKit(player, kitDisplayName);
352357
player.sendMessage(ChatColor.GREEN + "Public Kit loaded!");
353358
player.sendMessage(ChatColor.GRAY + "You can save a custom version this kit by importing into the kit editor");
354359
});

src/main/java/dev/noah/perplayerkit/util/BroadcastManager.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ private void broadcastMessage(Player player, String message, String permission)
9292
}
9393

9494
private void broadcastMessage(Player player, BroadcastManager.MessageKey key, CooldownManager cooldownManager) {
95+
broadcastMessage(player, key, cooldownManager, null);
96+
}
97+
98+
private void broadcastMessage(Player player, BroadcastManager.MessageKey key, CooldownManager cooldownManager, String kitName) {
9599

96100
if(!plugin.getConfig().getBoolean("feature.broadcast-on-player-action",true)){
97101
return;
@@ -133,6 +137,10 @@ private void broadcastMessage(Player player, BroadcastManager.MessageKey key, Co
133137

134138
message = message.replace("%player%", playerName);
135139

140+
if (kitName != null) {
141+
message = message.replace("%kitname%", kitName);
142+
}
143+
136144
broadcastMessage(player, message, permission);
137145

138146
if (cooldownManager != null) {
@@ -152,12 +160,12 @@ public void broadcastPlayerOpenedKitRoom(Player player) {
152160
broadcastMessage(player, MessageKey.PLAYER_OPENED_KIT_ROOM, kitroomBroadcastCooldown);
153161
}
154162

155-
public void broadcastPlayerLoadedPrivateKit(Player player) {
156-
broadcastMessage(player, MessageKey.PLAYER_LOADED_PRIVATE_KIT, null);
163+
public void broadcastPlayerLoadedPrivateKit(Player player, String kitName) {
164+
broadcastMessage(player, MessageKey.PLAYER_LOADED_PRIVATE_KIT, null, kitName);
157165
}
158166

159-
public void broadcastPlayerLoadedPublicKit(Player player) {
160-
broadcastMessage(player, MessageKey.PLAYER_LOADED_PUBLIC_KIT, null);
167+
public void broadcastPlayerLoadedPublicKit(Player player, String kitName) {
168+
broadcastMessage(player, MessageKey.PLAYER_LOADED_PUBLIC_KIT, null, kitName);
161169
}
162170

163171
public void broadcastPlayerLoadedEnderChest(Player player) {

0 commit comments

Comments
 (0)