Skip to content

Commit fc0571f

Browse files
RadBuilderRadBuilder
committed
Use org.bukkit.ChatColor
Use org.bukkit.ChatColor for messages and items instead of the "§" symbol.
1 parent 25890b6 commit fc0571f

21 files changed

Lines changed: 120 additions & 100 deletions

‎core/src/main/java/be/isach/ultracosmetics/UltraCosmeticsData.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import be.isach.ultracosmetics.util.ServerVersion;
55
import be.isach.ultracosmetics.version.VersionManager;
66
import org.bukkit.Bukkit;
7+
import org.bukkit.ChatColor;
78
import org.bukkit.plugin.Plugin;
89

910
/**
@@ -108,15 +109,15 @@ void checkTreasureChests() {
108109
treasureChests = true;
109110
if (!Bukkit.getPluginManager().isPluginEnabled("Vault")
110111
&& (boolean) SettingsManager.getConfig().get("TreasureChests.Loots.Money.Enabled")) {
111-
Bukkit.getConsoleSender().sendMessage("§c§l-------------------------");
112-
Bukkit.getConsoleSender().sendMessage("§c§l");
113-
Bukkit.getConsoleSender().sendMessage("§c§l");
114-
Bukkit.getConsoleSender().sendMessage("§c§lTreasure Chests' Money Loot requires Vault!");
115-
Bukkit.getConsoleSender().sendMessage("§c§l");
116-
Bukkit.getConsoleSender().sendMessage("§c§lMoney Loot is turned off!");
117-
Bukkit.getConsoleSender().sendMessage("§c§l");
118-
Bukkit.getConsoleSender().sendMessage("§c§l");
119-
Bukkit.getConsoleSender().sendMessage("§c§l-------------------------");
112+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "-------------------------");
113+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD);
114+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD);
115+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Treasure Chests' Money Loot requires Vault!");
116+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD);
117+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Money Loot is turned off!");
118+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD);
119+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD);
120+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "-------------------------");
120121
moneyTreasureLoot = false;
121122
}
122123
}

‎core/src/main/java/be/isach/ultracosmetics/command/CommandManager.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import be.isach.ultracosmetics.command.subcommands.*;
55
import be.isach.ultracosmetics.config.MessageManager;
66
import be.isach.ultracosmetics.util.MathUtils;
7+
8+
import org.bukkit.ChatColor;
79
import org.bukkit.command.Command;
810
import org.bukkit.command.CommandExecutor;
911
import org.bukkit.command.CommandSender;
@@ -44,7 +46,7 @@ public void registerCommand(SubCommand meCommand) {
4446

4547
public void showHelp(CommandSender commandSender, int page) {
4648
commandSender.sendMessage("");
47-
commandSender.sendMessage("§f§l UltraCosmetics Help (/uc <page>) §8§l(" + page + "/" + getMaxPages() + ")");
49+
commandSender.sendMessage(ChatColor.WHITE + "" + ChatColor.BOLD + " UltraCosmetics Help (/uc <page>) " + ChatColor.DARK_GRAY + "" + ChatColor.BOLD + "(" + page + "/" + getMaxPages() + ")");
4850
int from = 1;
4951
if (page > 1)
5052
from = 8 * (page - 1) + 1;
@@ -53,7 +55,7 @@ public void showHelp(CommandSender commandSender, int page) {
5355
if (h > commands.size())
5456
break;
5557
SubCommand sub = commands.get(h - 1);
56-
commandSender.sendMessage(" §8| §7" + sub.getUsage() + "§f§o " + sub.getDescription());
58+
commandSender.sendMessage(" " + ChatColor.DARK_GRAY + "| " + ChatColor.GRAY + sub.getUsage() + ChatColor.WHITE + " " + ChatColor.ITALIC + sub.getDescription());
5759
}
5860
}
5961

‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandClear.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import be.isach.ultracosmetics.player.UltraPlayer;
55
import be.isach.ultracosmetics.command.SubCommand;
66
import org.bukkit.Bukkit;
7+
import org.bukkit.ChatColor;
78
import org.bukkit.command.CommandSender;
89
import org.bukkit.command.ConsoleCommandSender;
910
import org.bukkit.entity.Player;
@@ -30,15 +31,15 @@ protected void onExeConsole(ConsoleCommandSender sender, String... args) {
3031
private void common(CommandSender sender, String... args) {
3132
Player receiver;
3233
if (args.length < 2) {
33-
sender.sendMessage("§c§l Incorrect Usage. " + getUsage());
34+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. " + getUsage());
3435
return;
3536
}
3637

3738
if (!sender.hasPermission(getPermission() + ".others")) return;
3839
receiver = Bukkit.getPlayer(args[1]);
3940

4041
if (receiver == null) {
41-
sender.sendMessage(" §c§lPlayer " + args[1] + " not found!");
42+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[1] + " not found!");
4243
return;
4344
}
4445
if (args.length < 3) {
@@ -58,7 +59,7 @@ private void common(CommandSender sender, String... args) {
5859
else if (s.startsWith("mou")) up.removeMount();
5960
else if (s.startsWith("e")) up.removeEmote();
6061
else {
61-
sender.sendMessage("§c§l/uc menu <menu>\n§c§lInvalid Type.\n§c§lAvailable types: gadgets, particleeffects, pets, mounts, suits, hats, morphs");
62+
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&c&l/uc menu <menu>\n&c&lInvalid Type.\n&c&lAvailable types: gadgets, particleeffects, pets, mounts, suits, hats, morphs"));
6263
}
6364
}
6465
}

‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandGive.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import be.isach.ultracosmetics.UltraCosmetics;
44
import be.isach.ultracosmetics.UltraCosmeticsData;
5-
import be.isach.ultracosmetics.player.UltraPlayer;
65
import be.isach.ultracosmetics.command.SubCommand;
76
import be.isach.ultracosmetics.config.MessageManager;
87
import be.isach.ultracosmetics.config.SettingsManager;
98
import be.isach.ultracosmetics.cosmetics.type.GadgetType;
109
import be.isach.ultracosmetics.mysql.MySqlConnectionManager;
1110
import be.isach.ultracosmetics.util.MathUtils;
1211
import org.bukkit.Bukkit;
12+
import org.bukkit.ChatColor;
1313
import org.bukkit.OfflinePlayer;
1414
import org.bukkit.command.ConsoleCommandSender;
1515
import org.bukkit.entity.Player;
@@ -30,11 +30,11 @@ protected void onExePlayer(Player sender, String... args) {
3030
if (args.length < 3) {
3131
if (args.length == 2) {
3232
if (args[1].startsWith("k"))
33-
sender.sendMessage(" §c§lIncorrect Usage. /uc give key <amount> [player]");
33+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give key <amount> [player]");
3434
else if (args[1].startsWith("a"))
35-
sender.sendMessage(" §c§lIncorrect Usage. /uc give ammo <gadget> <amount> [player]");
35+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give ammo <gadget> <amount> [player]");
3636
} else
37-
sender.sendMessage(" §c§lIncorrect Usage. " + getUsage());
37+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. " + getUsage());
3838
return;
3939
}
4040

@@ -46,24 +46,24 @@ else if (args[1].startsWith("a"))
4646
receiver = Bukkit.getPlayer(args[3]);
4747
if (receiver == null
4848
&& Bukkit.getOfflinePlayer(args[3]) == null) {
49-
sender.sendMessage(" §c§lPlayer " + args[3] + " not found!");
49+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " not found!");
5050
return;
5151
}
5252
if (Bukkit.getOfflinePlayer(args[3]) != null
5353
&& Bukkit.getOfflinePlayer(args[3]).hasPlayedBefore()
5454
&& Bukkit.getPlayer(args[3]) == null) {
55-
sender.sendMessage(" §c§lPlayer " + args[3] + " is offline.");
55+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " is offline.");
5656

5757
receiver = Bukkit.getOfflinePlayer(args[3]);
5858
}
5959

6060
if (receiver == null) {
61-
sender.sendMessage(" §c§lPlayer " + args[3] + " not found!");
61+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " not found!");
6262
return;
6363
}
6464
}
6565
if (!MathUtils.isInteger(args[2])) {
66-
sender.sendMessage(" §c§l" + args[2] + " isn't a number!");
66+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + args[2] + " isn't a number!");
6767
return;
6868
}
6969

@@ -72,31 +72,31 @@ else if (args[1].startsWith("a"))
7272
for (int i = 0; i < keys; i++)
7373
addKey(receiver);
7474

75-
sender.sendMessage(" §c§l" + keys + " treasure keys given to " + receiver.getName());
75+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + keys + " treasure keys given to " + receiver.getName());
7676
return;
7777

7878
} else if (arg1.startsWith("a")) { // Giving ammo. /uc give ammo <type> <amount> [player]
7979
if (args.length < 4) {
80-
sender.sendMessage(" §c§lIncorrect Usage. /uc give ammo <gadget> <amount> [player]");
80+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give ammo <gadget> <amount> [player]");
8181
return;
8282
}
8383
if (args.length > 4) {
8484
receiver = Bukkit.getPlayer(args[4]);
8585
if (receiver == null
8686
&& Bukkit.getOfflinePlayer(args[4]) == null) {
87-
sender.sendMessage(" §c§lPlayer " + args[4] + " not found and has never come!");
87+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " not found and has never come!");
8888
return;
8989
}
9090
if (Bukkit.getOfflinePlayer(args[4]) != null
9191
&& Bukkit.getOfflinePlayer(args[4]).hasPlayedBefore()
9292
&& Bukkit.getPlayer(args[4]) == null) {
93-
sender.sendMessage(" §c§lPlayer " + args[4] + " is offline.");
93+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " is offline.");
9494

9595
receiver = Bukkit.getOfflinePlayer(args[4]);
9696
}
9797

9898
if (receiver == null) {
99-
sender.sendMessage(" §c§lPlayer " + args[4] + " not found and has never come!");
99+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " not found and has never come!");
100100
return;
101101
}
102102
}
@@ -107,25 +107,25 @@ else if (args[1].startsWith("a"))
107107
sender.sendMessage(MessageManager.getMessage("Invalid-Gadget"));
108108
StringBuilder sb = new StringBuilder();
109109
for (int i = 0; i < GadgetType.enabled().size(); i++)
110-
sb.append(GadgetType.enabled().get(i).toString().toLowerCase() + ((i != GadgetType.enabled().size() - 1) ? "§f§l, §c" : ""));
111-
sender.sendMessage("§c§lGadget Types: §c" + sb.toString());
110+
sb.append(GadgetType.enabled().get(i).toString().toLowerCase() + ((i != GadgetType.enabled().size() - 1) ? ChatColor.WHITE + "" + ChatColor.BOLD + ", " + ChatColor.RED : ""));
111+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Gadget Types: " + ChatColor.RED + sb.toString());
112112
return;
113113
}
114114

115115
if (!gadgetType.isEnabled()) {
116-
sender.sendMessage(" §c§lThis gadget isn't enabled!");
116+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " This gadget isn't enabled!");
117117
return;
118118
}
119119
if (!MathUtils.isInteger(args[3])) {
120-
sender.sendMessage(" §c§l" + args[3] + " isn't a number!");
120+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + args[3] + " isn't a number!");
121121
return;
122122
}
123123
int ammo = Math.max(0, Math.min(Integer.MAX_VALUE, Integer.parseInt(args[3])));
124124
addAmmo(gadgetType, receiver, ammo);
125-
sender.sendMessage(" §c§l" + ammo + " " + gadgetType.toString().toLowerCase() + " ammo given to " + receiver.getName());
125+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + ammo + " " + gadgetType.toString().toLowerCase() + " ammo given to " + receiver.getName());
126126
return;
127127
} else {
128-
sender.sendMessage(" §c§lIncorrect Usage. " + getUsage());
128+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. " + getUsage());
129129
return;
130130
}
131131
}
@@ -135,11 +135,11 @@ protected void onExeConsole(ConsoleCommandSender sender, String... args) {
135135
if (args.length < 4) {
136136
if (args.length == 2) {
137137
if (args[1].startsWith("k"))
138-
sender.sendMessage(" §c§lIncorrect Usage. /uc give key <amount> <player>");
138+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give key <amount> <player>");
139139
else if (args[1].startsWith("a"))
140-
sender.sendMessage(" §c§lIncorrect Usage. /uc give ammo <gadget> <amount> <player>");
140+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give ammo <gadget> <amount> <player>");
141141
} else
142-
sender.sendMessage(" §c§lIncorrect Usage. " + getUsage());
142+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. " + getUsage());
143143
return;
144144
}
145145

@@ -150,51 +150,51 @@ else if (args[1].startsWith("a"))
150150
receiver = Bukkit.getPlayer(args[3]);
151151
if (receiver == null
152152
&& Bukkit.getOfflinePlayer(args[3]) == null) {
153-
sender.sendMessage(" §c§lPlayer " + args[3] + " not found and has never come!");
153+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " not found and has never come!");
154154
return;
155155
}
156156
if (Bukkit.getOfflinePlayer(args[3]) != null) {
157-
sender.sendMessage(" §c§lPlayer " + args[3] + " is offline.");
157+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " is offline.");
158158

159159
receiver = Bukkit.getOfflinePlayer(args[3]);
160160
}
161161

162162
if (receiver == null) {
163-
sender.sendMessage(" §c§lPlayer " + args[3] + " not found and has never come!");
163+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[3] + " not found and has never come!");
164164
return;
165165
}
166166

167167
if (!MathUtils.isInteger(args[2])) {
168-
sender.sendMessage(" §c§l" + args[2] + " isn't a number!");
168+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + args[2] + " isn't a number!");
169169
return;
170170
}
171171

172172
int keys = Math.max(0, Math.min(Integer.MAX_VALUE, Integer.parseInt(args[2])));
173173

174174
for (int i = 0; i < keys; i++)
175175
addKey(receiver);
176-
sender.sendMessage(" §c§l" + keys + " treasure keys given to " + receiver.getName());
176+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + keys + " treasure keys given to " + receiver.getName());
177177
return;
178178

179179
} else if (arg1.startsWith("a")) {
180180
if (args.length < 5) {
181-
sender.sendMessage(" §c§lIncorrect Usage. /uc give ammo <gadget> <amount> <player>");
181+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give ammo <gadget> <amount> <player>");
182182
return;
183183
}
184184
receiver = Bukkit.getPlayer(args[4]);
185185
if (receiver == null
186186
&& Bukkit.getOfflinePlayer(args[4]) == null) {
187-
sender.sendMessage(" §c§lPlayer " + args[4] + " not found!");
187+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " not found!");
188188
return;
189189
}
190190
if (Bukkit.getOfflinePlayer(args[4]) != null) {
191-
sender.sendMessage(" §c§lPlayer " + args[4] + " is offline.");
191+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " is offline.");
192192

193193
receiver = Bukkit.getOfflinePlayer(args[4]);
194194
}
195195

196196
if (receiver == null) {
197-
sender.sendMessage(" §c§lPlayer " + args[4] + " not found!");
197+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Player " + args[4] + " not found!");
198198
return;
199199
}
200200
GadgetType gadgetType;
@@ -204,25 +204,25 @@ else if (args[1].startsWith("a"))
204204
sender.sendMessage(MessageManager.getMessage("Invalid-Gadget"));
205205
StringBuilder sb = new StringBuilder();
206206
for (int i = 0; i < GadgetType.enabled().size(); i++)
207-
sb.append(GadgetType.enabled().get(i).toString().toLowerCase() + ((i != GadgetType.enabled().size() - 1) ? "§f§l, §c" : ""));
208-
sender.sendMessage("§c§lGadget Types: §c" + sb.toString());
207+
sb.append(GadgetType.enabled().get(i).toString().toLowerCase() + ((i != GadgetType.enabled().size() - 1) ? ChatColor.WHITE + "" + ChatColor.BOLD +", " + ChatColor.RED : ""));
208+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "Gadget Types: " + ChatColor.RED + "" + sb.toString());
209209
return;
210210
}
211211

212212
if (!gadgetType.isEnabled()) {
213-
sender.sendMessage(" §c§lThis gadget isn't enabled!");
213+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " This gadget isn't enabled!");
214214
return;
215215
}
216216
if (!MathUtils.isInteger(args[3])) {
217-
sender.sendMessage(" §c§l" + args[3] + " isn't a number!");
217+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + args[3] + " isn't a number!");
218218
return;
219219
}
220220
int ammo = Math.max(0, Math.min(Integer.MAX_VALUE, Integer.parseInt(args[3])));
221221
addAmmo(gadgetType, receiver, ammo);
222-
sender.sendMessage(" §c§l" + ammo + " " + gadgetType.toString().toLowerCase() + " ammo given to " + receiver.getName());
222+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " " + ammo + " " + gadgetType.toString().toLowerCase() + " ammo given to " + receiver.getName());
223223
return;
224224
} else {
225-
sender.sendMessage(" §c§lIncorrect Usage. /uc give <key|ammo> <amount> <player>");
225+
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + " Incorrect Usage. /uc give <key|ammo> <amount> <player>");
226226
return;
227227
}
228228
}

0 commit comments

Comments
 (0)