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

Improved link check (gives more info)

Browse Source
This commit is contained in:
Teriuihi 2022-12-27 18:51:02 +01:00
parent 130d8b027a
commit 29d0757279
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/alttd/proxydiscordlink/config/Config.java
View File

@ -201,7 +201,8 @@ public final class Config {
public static String ALREADY_GOT_CODE = "<yellow>You have already got your code. Your code is <gold><code><gold></yellow>";
public static String ACCOUNTS_NOT_LINKED = "<yellow>Your Minecraft and Discord accounts aren't linked</yellow>";
public static String UNLINKED_ACCOUNTS = "<yellow>You have successfully unlinked your accounts.</yellow>";
public static String IS_LINKED = "<yellow><player> is <linked_status>.</yellow>";
public static String IS_LINKED = "<yellow><player> is linked with discord user: <discord> (<discord_id>).</yellow>";
public static String IS_NOT_LINKED = "<yellow><player> is not linked.</yellow>";
public static String WHITELIST_LINK_MESSAGE = "<green>You aren't linked yet! If you would like to link your account join our discord and use the following command in the link channel: <gold>&link <code></gold>.</green>";
public static String INVALID_PLAYER = "<red><player> is not online or is not a valid player.</red>";
public static String NO_PERMISSION = "<red>You do not have permission to do that.</red>";
@ -226,6 +227,7 @@ public final class Config {
ACCOUNTS_NOT_LINKED = getString("messages.accounts-not-linked", ACCOUNTS_NOT_LINKED);
UNLINKED_ACCOUNTS = getString("messages.unlinked-accounts", UNLINKED_ACCOUNTS);
IS_LINKED = getString("messages.is-linked", IS_LINKED);
IS_NOT_LINKED = getString("messages.is-not-linked", IS_NOT_LINKED);
WHITELIST_LINK_MESSAGE = getString("messages.whitelist-link-message", WHITELIST_LINK_MESSAGE);
INVALID_PLAYER = getString("messages.invalid-player", INVALID_PLAYER);
NO_PERMISSION = getString("messages.no-permission", NO_PERMISSION);

17
src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/CheckLinked.java
View File

@ -3,6 +3,7 @@ package com.alttd.proxydiscordlink.minecraft.commands.subcommands;
import com.alttd.proxydiscordlink.DiscordLink;
import com.alttd.proxydiscordlink.config.Config;
import com.alttd.proxydiscordlink.minecraft.commands.SubCommand;
import com.alttd.proxydiscordlink.objects.DiscordLinkPlayer;
import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.proxy.Player;
import net.kyori.adventure.text.minimessage.MiniMessage;
@ -63,11 +64,17 @@ public class CheckLinked implements SubCommand {
}
private void isLinked(CommandSource source, Player player) {
TagResolver tagResolver = TagResolver.resolver(
Placeholder.unparsed("linked_status", DiscordLink.getPlugin().getDatabase()
.playerIsLinked(player.getUniqueId()) ? "linked" : "not linked"),
Placeholder.unparsed("player", player.getUsername()));
DiscordLinkPlayer linkPlayer = DiscordLink.getPlugin().getDatabase()
.getPlayer(player.getUniqueId());
TagResolver tagResolver = TagResolver.resolver(Placeholder.unparsed("player", player.getUsername()));
if (!linkPlayer.isActive()) {
source.sendMessage(miniMessage.deserialize(Config.MESSAGES.IS_NOT_LINKED, tagResolver));
return;
}
tagResolver = TagResolver.resolver(
tagResolver,
Placeholder.unparsed("discord", linkPlayer.getDiscordUsername()),
Placeholder.unparsed("discord_id", linkPlayer.getUserId() + ""));
source.sendMessage(miniMessage.deserialize(Config.MESSAGES.IS_LINKED, tagResolver));
}