Updated MiniMessage

This commit is contained in:
2021-12-31 18:44:32 +01:00
parent de11502f37
commit d59c58f066
16 changed files with 100 additions and 60 deletions
@@ -40,23 +40,25 @@ public class CommandManager implements CommandExecutor, TabExecutor {
new CommandCreateVillager(),
new CommandReload(),
new CommandRemoveVillager());
miniMessage = MiniMessage.get();
miniMessage = MiniMessage.miniMessage();
}
@Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) {
if (args.length == 0) {
commandSender.sendMessage(miniMessage.parse(Config.HELP_MESSAGE_WRAPPER, Template.of("commands", subCommands.stream()
commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER, List.of(
Template.template("commands", subCommands.stream()
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getHelpMessage)
.collect(Collectors.joining("\n")))));
.collect(Collectors.joining("\n")))
));
return true;
}
SubCommand subCommand = getSubCommand(args[0]);
if (!commandSender.hasPermission(subCommand.getPermission())) {
commandSender.sendMessage(miniMessage.parse(Config.NO_PERMISSION));
commandSender.sendMiniMessage(Config.NO_PERMISSION, null);
return true;
}
@@ -10,7 +10,7 @@ public abstract class SubCommand {
private final MiniMessage miniMessage;
public SubCommand() {
miniMessage = MiniMessage.get();
miniMessage = MiniMessage.miniMessage();
}
public abstract boolean onCommand(CommandSender commandSender, String[] args);
@@ -8,6 +8,7 @@ import com.alttd.objects.LoadedVillagers;
import com.alttd.objects.VillagerType;
import com.alttd.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
@@ -26,26 +27,26 @@ public class CommandCreateVillager extends SubCommand {
@Override
public boolean onCommand(CommandSender commandSender, String[] args) {
if (args.length != 9) {
commandSender.sendMessage(getMiniMessage().parse(getHelpMessage()));
commandSender.sendMiniMessage(getHelpMessage(), null);
return true;
}
Optional<VillagerType> first = VillagerType.getVillagerTypes().stream().filter(villagerType -> villagerType.getName().equalsIgnoreCase(args[1])).findFirst();
if (first.isEmpty()) {
commandSender.sendMessage(getMiniMessage().parse(getHelpMessage()));
commandSender.sendMiniMessage(getHelpMessage(), null);
return true;
}
VillagerType villagerType = first.get();
Villager.Type type = Villager.Type.valueOf(args[2].toUpperCase());
if (type == null) { //TODO test if this might need a try catch?
commandSender.sendMessage(getMiniMessage().parse(getHelpMessage()));
commandSender.sendMiniMessage(getHelpMessage(), null);
return true;
}
World world = Bukkit.getServer().getWorld(args[8]);
if (world == null) {
commandSender.sendMessage(getMiniMessage().parse(getHelpMessage()));
commandSender.sendMiniMessage(getHelpMessage(), null);
return true;
}
Location location = new Location(world, Double.parseDouble(args[3]),Double.parseDouble(args[4]),Double.parseDouble(args[5]), Float.parseFloat(args[6]), Float.parseFloat(args[7]));
@@ -55,7 +56,9 @@ public class CommandCreateVillager extends SubCommand {
villager.setVillagerType(type);
villager.setProfession(villagerType.getProfession());
villager.setRemoveWhenFarAway(false);
villager.customName(getMiniMessage().parse(Config.VILLAGER_NAME, Template.of("name", villagerType.getDisplayName())));
villager.customName(getMiniMessage().deserialize(Config.VILLAGER_NAME, TemplateResolver.resolving(
Template.template("name", villagerType.getDisplayName())))
);
villager.setCustomNameVisible(true);
villager.setAI(false);
@@ -4,6 +4,7 @@ import com.alttd.commands.CommandManager;
import com.alttd.commands.SubCommand;
import com.alttd.config.Config;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
@@ -21,10 +22,12 @@ public class CommandHelp extends SubCommand {
@Override
public boolean onCommand(CommandSender commandSender, String[] args) {
commandSender.sendMessage(getMiniMessage().parse(Config.HELP_MESSAGE_WRAPPER, Template.of("commands", commandManager.getSubCommands().stream()
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getHelpMessage)
.collect(Collectors.joining("\n")))));
commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER,
List.of(Template.template("commands", commandManager
.getSubCommands().stream()
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getHelpMessage)
.collect(Collectors.joining("\n")))));
return true;
}
@@ -16,7 +16,7 @@ public class CommandReload extends SubCommand {
Config.reload();
VillagerConfig.reload();
WorthConfig.reload();
commandSender.sendMessage(getMiniMessage().parse("<green>Reloaded VillagerShopUI config.</green>"));
commandSender.sendMiniMessage("<green>Reloaded VillagerShopUI config.</green>", null);
return true;
}
@@ -19,7 +19,7 @@ public class CommandRemoveVillager extends SubCommand {
@Override
public boolean onCommand(CommandSender commandSender, String[] args) {
if (!(commandSender instanceof Player player)) {
commandSender.sendMessage(getMiniMessage().parse(Config.NO_CONSOLE));
commandSender.sendMiniMessage(Config.NO_CONSOLE, null);
return true;
}
@@ -32,7 +32,8 @@ public class CommandRemoveVillager extends SubCommand {
LoadedVillagers.removeLoadedVillager(uuid);
VillagerConfig.removeVillager(uuid);
entity.remove();
player.sendMessage(getMiniMessage().parse(Config.REMOVED_VILLAGER, Template.of("uuid", uuid.toString())));
player.sendMiniMessage(Config.REMOVED_VILLAGER, List.of(
Template.template("uuid", uuid.toString())));
}
return true;
}