Skip to content

Commit 797f596

Browse files
TheMeinerLPTheMeinerLP
committed
Fix messages
1 parent 4947527 commit 797f596

2 files changed

Lines changed: 30 additions & 34 deletions

File tree

‎src/main/java/dev/themeinerlp/bettergopaint/command/Handler.java‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import dev.themeinerlp.bettergopaint.BetterGoPaint;
2222
import dev.themeinerlp.bettergopaint.objects.other.Settings;
2323
import dev.themeinerlp.bettergopaint.objects.player.PlayerBrush;
24+
import net.kyori.adventure.text.minimessage.MiniMessage;
2425
import net.md_5.bungee.api.ChatColor;
2526
import net.md_5.bungee.api.chat.ClickEvent;
2627
import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -47,76 +48,69 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
4748
Player p = (Player) sender;
4849
PlayerBrush pb = BetterGoPaint.getBrushManager().getPlayerBrush(p);
4950
String prefix = Settings.settings().GENERIC.PREFIX;
50-
if (!p.hasPermission("gopaint.use")) {
51-
p.sendMessage(prefix + "§cYou are lacking the permission gopaint.use");
51+
if (!p.hasPermission("bettergopaint.use")) {
52+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>You are lacking the permission bettergopaint" +
53+
".use"));
5254
return true;
5355
}
5456
if (args.length == 0) {
55-
if (p.hasPermission("gopaint.admin")) {
56-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo§7|§creload");
57+
if (p.hasPermission("bettergopaint.admin")) {
58+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>|<red>reload"));
5759
return true;
5860
}
59-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo");
61+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>"));
6062
return true;
6163
} else if (args.length == 1) {
6264
if (args[0].equalsIgnoreCase("size")) {
63-
p.sendMessage(prefix + "§c/gp size [number]");
65+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§<red>/gp size [number]"));
6466
return true;
6567
} else if (args[0].equalsIgnoreCase("toggle")) {
6668
if (pb.isEnabled()) {
6769
pb.toggleEnabled();
68-
p.sendMessage(prefix + "§cDisabled brush");
70+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§cDisabled brush"));
6971
} else {
7072
pb.toggleEnabled();
71-
p.sendMessage(prefix + "§aEnabled brush");
73+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "§aEnabled brush"));
7274
}
7375
return true;
7476
} else if ((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("r")) && p.hasPermission(
75-
"gopaint.admin")) {
77+
"bettergopaint.admin")) {
7678
plugin.reload();
77-
p.sendMessage(prefix + "§aReloaded");
79+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<green>Reloaded"));
7880
return true;
7981
} else if (args[0].equalsIgnoreCase("info") || args[0].equalsIgnoreCase("i")) {
80-
81-
p.spigot().sendMessage(new ComponentBuilder("goPaint> ").color(ChatColor.AQUA)
82-
.append("Created by: ").color(ChatColor.GOLD)
83-
.append("Arcaniax").color(ChatColor.YELLOW).create());
84-
85-
86-
p.spigot().sendMessage(new ComponentBuilder("goPaint> ").color(ChatColor.AQUA)
87-
.append("Links: ").color(ChatColor.GOLD)
88-
.append("Twitter").color(ChatColor.DARK_AQUA).color(ChatColor.UNDERLINE)
89-
.event(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://twitter.com/Arcaniax")).append(" ")
90-
.append("Spigot").color(ChatColor.YELLOW).color(ChatColor.UNDERLINE)
91-
.event(new ClickEvent(
92-
ClickEvent.Action.OPEN_URL,
93-
"https://www.spigotmc.org/resources/authors/arcaniax.47444/"
94-
)).create());
82+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ " <aqua>Created by: <gold>TheMeinerLP"));
83+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix+ " <aqua>Links: <gold><click:url_open:'https" +
84+
"://twitter.com/themeinerlp'>Twitter " +
85+
"</click>"));
9586
return true;
9687
}
97-
if (p.hasPermission("gopaint.admin")) {
98-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo§7|§creload");
88+
if (p.hasPermission("bettergopaint.admin")) {
89+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray" +
90+
">|<red>info" +
91+
"<gray>" +
92+
"|<red>reload"));
9993
return true;
10094
}
101-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo");
95+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info"));
10296
return true;
10397
} else if (args.length == 2) {
10498
if (args[0].equalsIgnoreCase("size") || args[0].equalsIgnoreCase("s")) {
10599
try {
106100
int sizeAmount = Integer.parseInt(args[1]);
107101
pb.setBrushSize(sizeAmount);
108-
p.sendMessage(prefix + "§6Size set to: §e" + pb.getBrushSize());
102+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<gold>Size set to: <yellow>" + pb.getBrushSize()));
109103
return true;
110104
} catch (Exception e) {
111-
p.sendMessage(prefix + "§c/gb size [number]");
105+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gb size [number]"));
112106
return true;
113107
}
114108
}
115-
if (p.hasPermission("gopaint.admin")) {
116-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo§7|§creload");
109+
if (p.hasPermission("bettergopaint.admin")) {
110+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>|<red>reload"));
117111
return true;
118112
}
119-
p.sendMessage(prefix + "§c/gp size§7|§ctoggle§7|§cinfo");
113+
p.sendMessage(MiniMessage.miniMessage().deserialize(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>"));
120114
return true;
121115
}
122116
}

‎src/main/java/dev/themeinerlp/bettergopaint/listeners/InteractListener.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import dev.themeinerlp.bettergopaint.objects.other.Settings;
2525
import dev.themeinerlp.bettergopaint.objects.player.ExportedPlayerBrush;
2626
import dev.themeinerlp.bettergopaint.objects.player.PlayerBrush;
27+
import net.kyori.adventure.text.minimessage.MiniMessage;
28+
import net.royawesome.jlibnoise.module.combiner.Min;
2729
import org.bukkit.Location;
2830
import org.bukkit.entity.Player;
2931
import org.bukkit.event.EventHandler;
@@ -97,7 +99,7 @@ public void onClick(PlayerInteractEvent e) {
9799
if (pb.isEnabled()) {
98100
BukkitAdapter.adapt(p).runAsyncIfFree(() -> pb.getBrush().paint(loc, p));
99101
} else {
100-
p.sendMessage(Settings.settings().GENERIC.PREFIX + "§cYour brush is disabled, left click to enable the brush.");
102+
p.sendMessage(MiniMessage.miniMessage().deserialize(Settings.settings().GENERIC.PREFIX + "§cYour brush is disabled, left click to enable the brush."));
101103
}
102104
}
103105
if (e.getPlayer().getItemInHand().getType() == XMaterial.FEATHER.parseMaterial() && (e

0 commit comments

Comments
 (0)