Update development #5

Merge aplicado
Awakened-Redstone mesclou 27 commits from temp into development 2022-02-18 19:01:36 +00:00
5 arquivos alterados com 11 adições e 9 exclusões
Mostrando apenas as alterações do commit 0892e6a339 - Mostrar todos os commits
Awakened-Redstone 2021-12-05 00:32:30 -03:00

Ver arquivo

@ -1,5 +1,5 @@
plugins { plugins {
id "fabric-loom" version "0.8-SNAPSHOT" id "fabric-loom" version "0.10-SNAPSHOT"
} }
repositories { repositories {

Ver arquivo

@ -1,9 +1,9 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
minecraft_version=1.17.1 minecraft_version=1.17.1
yarn_mappings=1.17.1+build.10 yarn_mappings=1.17.1+build.65
loader_version=0.11.6 loader_version=0.11.6
mod_version=0.2.4 mod_version=beta-4
maven_group=com.awakenedredstone maven_group=com.awakenedredstone
archives_base_name=autowhitelist archives_base_name=autowhitelist
fabric_version=0.36.1+1.17 fabric_version=0.44.0+1.17

Ver arquivo

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Ver arquivo

@ -1,5 +1,6 @@
package com.awakenedredstone.autowhitelist.discord; package com.awakenedredstone.autowhitelist.discord;
import com.awakenedredstone.autowhitelist.lang.TranslatableText;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;
@ -18,7 +19,7 @@ public class BotHelper extends Bot {
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl()); embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
embedBuilder.setTitle(title.getString()); embedBuilder.setTitle(title.getString());
embedBuilder.setDescription(message.getString()); embedBuilder.setDescription(message.getString());
embedBuilder.setFooter("Minecraft PhoenixSC Edition"); embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
MessageAction messageAction = channel.sendMessage(embedBuilder.build()); MessageAction messageAction = channel.sendMessage(embedBuilder.build());
messageAction.queue(); messageAction.queue();
} }
@ -28,7 +29,7 @@ public class BotHelper extends Bot {
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl()); embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
embedBuilder.setTitle(title.getString()); embedBuilder.setTitle(title.getString());
embedBuilder.setDescription(message.getString()); embedBuilder.setDescription(message.getString());
embedBuilder.setFooter("Minecraft PhoenixSC Edition"); embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
embedBuilder.setColor(type.hexColor); embedBuilder.setColor(type.hexColor);
MessageAction messageAction = channel.sendMessage(embedBuilder.build()); MessageAction messageAction = channel.sendMessage(embedBuilder.build());
messageAction.queue(); messageAction.queue();
@ -49,7 +50,7 @@ public class BotHelper extends Bot {
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl()); embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
embedBuilder.setTitle(title.getString()); embedBuilder.setTitle(title.getString());
embedBuilder.setDescription(message.getString()); embedBuilder.setDescription(message.getString());
embedBuilder.setFooter("Minecraft PhoenixSC Edition"); embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
return new MessageBuilder(embedBuilder.build()).build(); return new MessageBuilder(embedBuilder.build()).build();
} }
@ -58,7 +59,7 @@ public class BotHelper extends Bot {
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl()); embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
embedBuilder.setTitle(title.getString()); embedBuilder.setTitle(title.getString());
embedBuilder.setDescription(message.getString()); embedBuilder.setDescription(message.getString());
embedBuilder.setFooter("Minecraft PhoenixSC Edition"); embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
embedBuilder.setColor(type.hexColor); embedBuilder.setColor(type.hexColor);
return new MessageBuilder(embedBuilder.build()).build(); return new MessageBuilder(embedBuilder.build()).build();
} }

Ver arquivo

@ -26,6 +26,7 @@
"command.too_many_args.message": "You have put too many arguments on the command.\nCheck the help command to see the command usage.", "command.too_many_args.message": "You have put too many arguments on the command.\nCheck the help command to see the command usage.",
"command.feedback.received.title": "Command feedback.", "command.feedback.received.title": "Command feedback.",
"command.feedback.received.message": "Your request has been received and is being processed, if you don't get another feedback message in the next minute than please contact a moderator.", "command.feedback.received.message": "Your request has been received and is being processed, if you don't get another feedback message in the next minute than please contact a moderator.",
"command.feedback.message.signature": "Minecraft PhoenixSC Edition",
"bot.activity.type": "DEFAULT", "bot.activity.type": "DEFAULT",
"bot.activity.message": "on the Member Server" "bot.activity.message": "on the Member Server"