Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-22 11:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do a few suggestions

Browse Source
This commit is contained in:
Vankka 2023-06-18 19:47:17 +03:00
parent aa8b0a9660
commit 13ea5382f9
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/LinkCommand.java
View File

@ -23,6 +23,7 @@ import com.discordsrv.common.command.game.abstraction.GameCommand;
import com.discordsrv.common.command.game.abstraction.GameCommandArguments;
import com.discordsrv.common.command.game.abstraction.GameCommandExecutor;
import com.discordsrv.common.command.game.sender.ICommandSender;
import net.kyori.adventure.text.Component;
public class LinkCommand implements GameCommandExecutor {
@ -46,6 +47,6 @@ public class LinkCommand implements GameCommandExecutor {
@Override
public void execute(ICommandSender sender, GameCommandArguments arguments) {
sender.sendMessage(Component.text("Not currently implemented")); // TODO
}
}

9
common/src/main/java/com/discordsrv/common/config/main/MainConfig.java
View File

@ -21,6 +21,8 @@ package com.discordsrv.common.config.main;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.common.config.Config;
import com.discordsrv.common.config.annotation.DefaultOnly;
import com.discordsrv.common.config.annotation.Order;
import com.discordsrv.common.config.connection.ConnectionConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.ChannelConfig;
import com.discordsrv.common.config.main.linking.LinkedAccountConfig;
@ -37,7 +39,7 @@ public abstract class MainConfig implements Config {
public static final String HEADER = String.join("\n", Arrays.asList(
"Welcome to the DiscordSRV configuration file",
"",
""
"Looking for the \"BotToken\" option? It has been moved into the " + ConnectionConfig.FILE_NAME
));
@Override
@ -67,8 +69,6 @@ public abstract class MainConfig implements Config {
public LinkedAccountConfig linkedAccounts = new LinkedAccountConfig();
public MemberCachingConfig memberCaching = new MemberCachingConfig();
public TimedUpdaterConfig timedUpdater = new TimedUpdaterConfig();
@Comment("Configuration options for group-role synchronization")
@ -81,4 +81,7 @@ public abstract class MainConfig implements Config {
public DiscordInviteConfig invite = new DiscordInviteConfig();
public abstract PluginIntegrationConfig integrations();
@Order(1000)
public MemberCachingConfig memberCaching = new MemberCachingConfig();
}

2
common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java
View File

@ -34,7 +34,7 @@ public class DiscordToMinecraftChatConfig {
@Comment("The Discord to Minecraft message format for regular users and bots")
@Untranslated(Untranslated.Type.VALUE)
public String format = "[&#5865F2Discord&r] [hover:show_text:Tag: %user_tag%&r\nRoles: %user_roles:', '|text:'&7&oNone'%]%user_color%%user_effective_server_name%&r%message_reply% » %message%%message_attachments%";
public String format = "[&#5865F2Discord&r] [hover:show_text:Username: @%user_name%&r\nRoles: %user_roles:', '|text:'&7&oNone'%]%user_color%%user_effective_server_name%&r%message_reply% » %message%%message_attachments%";
@Comment("The Discord to Minecraft message format for webhook messages (if enabled)")
@Untranslated(Untranslated.Type.VALUE)