Altitude/LiteFlags
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update minimessage references for 1.18.2

Browse Source
This commit is contained in:
Len 2022-05-22 16:00:53 +02:00
parent 9debf2aea4
commit 45ce9a560c
10 changed files with 79 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -35,16 +35,15 @@
<repositories>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
<id>Alttd-Nexus</id>
<url>https://repo.destro.xyz/snapshots</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<dependency><!-- Galaxy -->
<groupId>com.alttd</groupId>
<artifactId>Galaxy-API</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>

8
src/main/java/com/liteflags/auth/AuthTimer.java
View File

@ -3,14 +3,14 @@ package com.liteflags.auth;
import com.liteflags.LiteFlags;
import com.liteflags.config.Config;
import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -36,8 +36,8 @@ public class AuthTimer<taskID> {
final String code = MapCache.reauthedPlayers.get(uuid);
if (code == null)
return;
player.sendMiniMessage(Config.AUTHENTICATE, List.of(
Template.template("code", code)));
player.sendMiniMessage(Config.AUTHENTICATE, TagResolver.resolver(
Placeholder.unparsed("code", code)));
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), Config.AUTH_MESSAGE_COMMAND
.replaceAll("<player>", player.getName())
.replaceAll("<code>", code));

6
src/main/java/com/liteflags/auth/Authentication.java
View File

@ -2,8 +2,8 @@ package com.liteflags.auth;
import com.liteflags.data.maps.MapCache;
import com.liteflags.config.Config;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.entity.Player;
import java.util.List;
@ -30,7 +30,7 @@ public class Authentication {
MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
AuthTimer.startTimer(player);
player.sendMiniMessage(Config.AUTHENTICATE,
List.of(Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
TagResolver.resolver(Placeholder.unparsed("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
}
}

2
src/main/java/com/liteflags/commands/CommandManager.java
View File

@ -4,8 +4,6 @@ import com.liteflags.LiteFlags;
import com.liteflags.commands.subcommands.*;
import com.liteflags.config.Config;
import com.liteflags.util.Logger;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import org.bukkit.Bukkit;
import org.bukkit.command.*;
import org.bukkit.entity.Player;

44
src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java
View File

@ -10,8 +10,8 @@ import com.liteflags.util.Logger;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
@ -36,11 +36,11 @@ public class CommandFlagList extends SubCommand {
Logger.warning("% is not a flagged player", playerName);
return;
}
commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, List.of(
Template.template("player", player.getName() == null ? playerName : player.getName()),
Template.template("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))),
Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
Template.template("staff_flags", String.valueOf(Methods.staffFlags))
commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(
Placeholder.unparsed("player", player.getName() == null ? playerName : player.getName()),
Placeholder.unparsed("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))),
Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
));
});
} else
@ -57,7 +57,7 @@ public class CommandFlagList extends SubCommand {
body = Config.PLAYER_FLAG_LIST_SHORT;
OfflinePlayer player = Bukkit.getServer().getOfflinePlayerIfCached(args[1]);
if (player == null) {
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[1])));
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[1])));
return true;
}
new BukkitRunnable() {
@ -106,9 +106,9 @@ public class CommandFlagList extends SubCommand {
Component message = null;
while (resultSet.next()) {
if (message == null) {
message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TemplateResolver.templates(List.of(
Template.template("player", targetName),
Template.template("flag_amount", String.valueOf(resultSet.getString("total_flags")))
message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TagResolver.resolver(List.of(
Placeholder.unparsed("player", targetName),
Placeholder.unparsed("flag_amount", String.valueOf(resultSet.getString("total_flags")))
)));
}
long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
@ -117,15 +117,15 @@ public class CommandFlagList extends SubCommand {
int convertedExpireTime = (int) expireTime - (int) currentTime;
int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
String id = String.valueOf(resultSet.getInt("id"));
List<Template> templates = List.of(Template.template("player", targetPlayer.getName()),
Template.template("flag", resultSet.getString("reason")),
Template.template("staff", resultSet.getString("flagged_by")),
Template.template("flag_length", resultSet.getString("flag_length")),
Template.template("reason", resultSet.getString("reason")),
Template.template("flag_time", Utilities.convertTime(convertedFlaggedTime)),
Template.template("expire_time", Utilities.convertTime(convertedExpireTime)),
Template.template("nl", "\n"),
Template.template("id", id)
TagResolver templates = TagResolver.resolver(Placeholder.unparsed("player", targetPlayer.getName()),
Placeholder.unparsed("flag", resultSet.getString("reason")),
Placeholder.unparsed("staff", resultSet.getString("flagged_by")),
Placeholder.unparsed("flag_length", resultSet.getString("flag_length")),
Placeholder.unparsed("reason", resultSet.getString("reason")),
Placeholder.unparsed("flag_time", Utilities.convertTime(convertedFlaggedTime)),
Placeholder.unparsed("expire_time", Utilities.convertTime(convertedExpireTime)),
Placeholder.unparsed("nl", "\n"),
Placeholder.unparsed("id", id)
);
String str = String.join("\n", body)
.replaceAll("<remove_button>", "<white>" +
@ -138,10 +138,10 @@ public class CommandFlagList extends SubCommand {
str = str.replaceAll("<active>", Config.ACTIVE_FLAGS);
str = "\n" + str;
Logger.info(str);
message = message.append(miniMessage.deserialize(str, TemplateResolver.templates(templates)));
message = message.append(miniMessage.deserialize(str, TagResolver.resolver(templates)));
}
if (message == null) {
commandSender.sendMiniMessage(Config.NO_FLAGS_FOUND, List.of(Template.template("target", targetName)));
commandSender.sendMiniMessage(Config.NO_FLAGS_FOUND, TagResolver.resolver(Placeholder.unparsed("target", targetName)));
} else
commandSender.sendMessage(message);
} catch (SQLException exception) {

34
src/main/java/com/liteflags/commands/subcommands/CommandFlagPlayer.java
View File

@ -9,8 +9,8 @@ import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
@ -32,13 +32,13 @@ public class CommandFlagPlayer extends SubCommand {
OfflinePlayer target = Bukkit.getServer().getOfflinePlayerIfCached(args[0]);
if (target == null) {
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[2])));
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[2])));
return true;
}
if (Config.MAX_ACTIVE_FLAGS >= 0 && Methods.getTotalActiveFlags(target) >= Config.MAX_ACTIVE_FLAGS) {
commandSender.sendMiniMessage(Config.ACTIVE_FLAGS_LIMIT, List.of(
Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
commandSender.sendMiniMessage(Config.ACTIVE_FLAGS_LIMIT, TagResolver.resolver(
Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName())
));
return true;
}
@ -70,11 +70,11 @@ public class CommandFlagPlayer extends SubCommand {
MapCache.activeFlags.add(target.getName());
}
Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
Template.template("staff", sender.getName()),
Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Template.template("flag_length", "Permanent"),
Template.template("reason", reason)
Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
Placeholder.unparsed("staff", sender.getName()),
Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Placeholder.unparsed("flag_length", "Permanent"),
Placeholder.unparsed("reason", reason)
)));
Bukkit.getOnlinePlayers().stream()
@ -84,7 +84,7 @@ public class CommandFlagPlayer extends SubCommand {
private void tempFlag(CommandSender commandSender, String[] args, OfflinePlayer target) {
if (args[1].length() < 2) {
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, TagResolver.resolver(Placeholder.unparsed("arg", args[1])));
return;
}
@ -92,7 +92,7 @@ public class CommandFlagPlayer extends SubCommand {
String letter = args[1].substring(args[1].length() - 1);
String[] validTimes = new String[]{"d", "h", "m"};
if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, List.of(Template.template("arg", args[1])));
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, TagResolver.resolver(Placeholder.unparsed("arg", args[1])));
return;
}
@ -113,11 +113,11 @@ public class CommandFlagPlayer extends SubCommand {
MapCache.activeFlags.add(target.getName());
}
Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TemplateResolver.templates(List.of(
Template.template("staff", commandSender.getName()),
Template.template("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Template.template("flag_length", Utilities.convertTime(timeInMin)),
Template.template("reason", reason)
Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
Placeholder.unparsed("staff", commandSender.getName()),
Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Placeholder.unparsed("flag_length", Utilities.convertTime(timeInMin)),
Placeholder.unparsed("reason", reason)
)));
Bukkit.getOnlinePlayers().stream()

32
src/main/java/com/liteflags/commands/subcommands/CommandFlagRemove.java
View File

@ -4,8 +4,8 @@ import com.liteflags.commands.SubCommand;
import com.liteflags.config.Config;
import com.liteflags.data.database.Database;
import com.liteflags.util.Logger;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
@ -20,7 +20,7 @@ public class CommandFlagRemove extends SubCommand {
OfflinePlayer target = Bukkit.getServer().getOfflinePlayerIfCached(args[2]);
if (target == null) {
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[2])));
commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[2])));
return true;
}
if (args.length == 4) {
@ -31,15 +31,15 @@ public class CommandFlagRemove extends SubCommand {
String flagReason = Database.getFlagReason(target.getUniqueId(), id);
flagReason = flagReason == null ? "Flag not found" : flagReason;
if (Database.removeFlag(target.getUniqueId(), id)) {
commandSender.sendMiniMessage(Config.FLAG_REMOVED, List.of(
Template.template("flag_reason", flagReason),
Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName())
commandSender.sendMiniMessage(Config.FLAG_REMOVED, TagResolver.resolver(
Placeholder.unparsed("flag_reason", flagReason),
Placeholder.unparsed("target", target.getName() == null ? target.getUniqueId().toString() : target.getName())
));
Logger.info("% has removed the flag '%' from %'s flag history.", commandSender.getName(), flagReason, target.getName());
} else {
commandSender.sendMiniMessage(Config.NO_FLAG_FOUND, List.of(
Template.template("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Template.template("id", String.valueOf(id))
commandSender.sendMiniMessage(Config.NO_FLAG_FOUND, TagResolver.resolver(
Placeholder.unparsed("target", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
Placeholder.unparsed("id", String.valueOf(id))
));
}
} else if (args.length == 3) {
@ -48,14 +48,14 @@ public class CommandFlagRemove extends SubCommand {
// commandSender.sendMiniMessage("<white>Are you sure you want to remove the flag <flag_reason> from " +
// "<yellow><target_name></yellow>'s flag history? " +
// "<hover:Click to confirm><click:run_command:/flag remove " + id + " " + target.getName() + " -c>[<green>Confirm</green>]</click></hover></white>", List.of(
// Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
// Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
// Template.template("id", String.valueOf(id))
// Placeholder.unparsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
// Placeholder.unparsed("target_name", name == null ? target.getUniqueId().toString() : name),
// Placeholder.unparsed("id", String.valueOf(id))
// ));
commandSender.sendMiniMessage(Config.FLAG_CONFIRM, List.of(
Template.template("flag_reason", flagReason == null ? "Unknown" : flagReason),
Template.template("target_name", name == null ? target.getUniqueId().toString() : name),
Template.template("id", String.valueOf(id))
commandSender.sendMiniMessage(Config.FLAG_CONFIRM, TagResolver.resolver(
Placeholder.unparsed("flag_reason", flagReason == null ? "Unknown" : flagReason),
Placeholder.unparsed("target_name", name == null ? target.getUniqueId().toString() : name),
Placeholder.unparsed("id", String.valueOf(id))
));
}
return true;

2
src/main/java/com/liteflags/commands/subcommands/CommandHelp.java
View File

@ -3,8 +3,6 @@ package com.liteflags.commands.subcommands;
import com.liteflags.commands.CommandManager;
import com.liteflags.commands.SubCommand;
import com.liteflags.config.Config;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;

8
src/main/java/com/liteflags/events/ChatEvent.java
View File

@ -6,8 +6,8 @@ import com.liteflags.data.database.Database;
import com.liteflags.data.database.Methods;
import com.liteflags.data.maps.MapCache;
import com.liteflags.util.Logger;
import com.liteflags.util.Utilities;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -69,8 +69,8 @@ public class ChatEvent implements Listener {
} else {
e.setCancelled(true);
player.sendMiniMessage(Config.AUTHENTICATE_FAILED, List.of(
Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
player.sendMiniMessage(Config.AUTHENTICATE_FAILED, TagResolver.resolver(
Placeholder.unparsed("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
Logger.info(player.getName() + " tried talking while authenticating: " + e.getMessage());
}
}

14
src/main/java/com/liteflags/events/LoginEvent.java
View File

@ -7,8 +7,8 @@ import com.liteflags.data.database.Methods;
import com.liteflags.data.maps.MapCache;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -36,11 +36,11 @@ public class LoginEvent implements Listener {
MapCache.activeFlags.add(player.getName());
Component message = MiniMessage.miniMessage().deserialize(Config.ALERT_ACTIVE_FLAGS, TemplateResolver.templates(List.of(
Template.template("player", player.getName()),
Template.template("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
Template.template("console_flags", String.valueOf(Methods.consoleFlags)),
Template.template("staff_flags", String.valueOf(Methods.staffFlags))
Component message = MiniMessage.miniMessage().deserialize(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver(List.of(
Placeholder.unparsed("player", player.getName()),
Placeholder.unparsed("total_act_flags", String.valueOf(Methods.getTotalActiveFlags(player))),
Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)),
Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags))
)));
Bukkit.getOnlinePlayers().stream()