Skip to content

Commit aba50dc

Browse files
NikV2NikV2
committed
Commit
1 parent 9abcf32 commit aba50dc

5 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎src/main/java/me/nik/combatplus/listeners/EnchantedGoldenApple.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.api.Manager;
5+
import me.nik.combatplus.files.Lang;
56
import me.nik.combatplus.utils.Messenger;
67
import net.md_5.bungee.api.ChatMessageType;
78
import net.md_5.bungee.api.chat.TextComponent;
@@ -58,7 +59,8 @@ public void onEatEnchantedGoldenApple(PlayerItemConsumeEvent e) {
5859
public void run() {
5960
if (cooldown.containsKey(p)) {
6061
long secondsleft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
61-
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.sendLang("enchanted_golden_apple_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft))));
62+
String message = Lang.get().getString("enchanted_golden_apple_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft));
63+
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(message)));
6264
} else {
6365
cancel();
6466
}

‎src/main/java/me/nik/combatplus/listeners/Enderpearl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.api.Manager;
5+
import me.nik.combatplus.files.Lang;
56
import me.nik.combatplus.utils.Messenger;
67
import net.md_5.bungee.api.ChatMessageType;
78
import net.md_5.bungee.api.chat.TextComponent;
@@ -63,7 +64,8 @@ public void onInteract(PlayerInteractEvent e) {
6364
public void run() {
6465
if (cooldown.containsKey(p)) {
6566
long secondsleft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
66-
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.sendLang("enderpearl_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft))));
67+
String message = Lang.get().getString("enderpearl_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft));
68+
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(message)));
6769
} else {
6870
cancel();
6971
}

‎src/main/java/me/nik/combatplus/listeners/GoldenApple.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import me.nik.combatplus.CombatPlus;
44
import me.nik.combatplus.api.Manager;
5+
import me.nik.combatplus.files.Lang;
56
import me.nik.combatplus.utils.Messenger;
67
import net.md_5.bungee.api.ChatMessageType;
78
import net.md_5.bungee.api.chat.TextComponent;
@@ -58,7 +59,8 @@ public void onEatGoldenApple(PlayerItemConsumeEvent e) {
5859
public void run() {
5960
if (cooldown.containsKey(p)) {
6061
long secondsleft = ((cooldown.get(p) / 1000) + cdtime) - (System.currentTimeMillis() / 1000);
61-
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.sendLang("golden_apple_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft))));
62+
String message = Lang.get().getString("golden_apple_cooldown_actionbar").replaceAll("%seconds%", String.valueOf(secondsleft));
63+
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Messenger.format(message)));
6264
} else {
6365
cancel();
6466
}

‎src/main/java/me/nik/combatplus/utils/Messenger.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ public static String prefix(String msg) {
1515
public static String message(String msg) {
1616
return format(Lang.get().getString("prefix") + format(Lang.get().getString(msg)));
1717
}
18-
19-
public static String sendLang(String msg) {
20-
return format(Lang.get().getString(msg));
21-
}
2218
}

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ website: https://discord.gg/m7j2Y9H
1010
commands:
1111
combatplus:
1212
description: The all in one Combat System!
13-
usage: /<command>
13+
usage: /combatplus
1414
aliases:
1515
- cp
1616
permissions:

0 commit comments

Comments
 (0)