Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added crafatar as a secondary option for displaying players' skins

This commit is contained in:
Joe Shimell 2021-02-27 14:59:17 +00:00
parent d6e88aaaf4
commit 96701b44d4
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>uk.co.angrybee.joe</groupId>
<artifactId>discord-whitelister</artifactId>
<version>1.4.5</version>
<version>1.4.6</version>
<name>discord-whitelister</name>
<url>https://github.com/JoeShimell/DiscordWhitelisterSpigot</url>

6
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -459,7 +459,11 @@ public class DiscordClient extends ListenerAdapter
if(DiscordWhitelister.showPlayerSkin)
{
String playerUUID = DiscordClient.minecraftUsernameToUUID(finalNameToRemove);
embedBuilderSuccess.setThumbnail("https://minotar.net/armor/bust/" + playerUUID + "/100.png");
if(!MainConfig.getMainConfig().getBoolean("use-crafatar-for-avatars"))
embedBuilderSuccess.setThumbnail("https://minotar.net/armor/bust/" + playerUUID + "/100.png");
else
embedBuilderSuccess.setThumbnail("https://crafatar.com/avatars/" + playerUUID + "?size=100&default=MHF_Steve&overlay.png");
}
EmbedBuilder embedBuilderFailure;

2
src/main/java/uk/co/angrybee/joe/VersionInfo.java
View File

@ -10,5 +10,5 @@ public class VersionInfo
return "v." + getVersion();
}
private static String version = "1.4.5";
private static String version = "1.4.6";
}

7
src/main/java/uk/co/angrybee/joe/commands/discord/CommandAdd.java
View File

@ -436,7 +436,12 @@ public class CommandAdd
DiscordClient.AddWhitelistRemainingCount(embedBuilderWhitelistSuccess, (timesWhitelisted + 1));
if(DiscordWhitelister.showPlayerSkin)
embedBuilderWhitelistSuccess.setThumbnail("https://minotar.net/armor/bust/" + playerUUID + "/100.png");
{
if(!MainConfig.getMainConfig().getBoolean("use-crafatar-for-avatars"))
embedBuilderWhitelistSuccess.setThumbnail("https://minotar.net/armor/bust/" + playerUUID + "/100.png");
else
embedBuilderWhitelistSuccess.setThumbnail("https://crafatar.com/avatars/" + playerUUID + "?size=100&default=MHF_Steve&overlay.png");
}
EmbedBuilder embedBuilderWhitelistFailure;

2
src/main/java/uk/co/angrybee/joe/configs/MainConfig.java
View File

@ -153,6 +153,8 @@ public class MainConfig
CheckEntry("hide-info-command-replies", false);
CheckEntry("use-crafatar-for-avatars", false);
// Remove old role entry if found, move role to new array (for people with v1.3.6 or below)
if(whitelisterBotConfig.get("whitelisted-role") != null)
{

2
src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: DiscordWhitelister
version: 1.4.5
version: 1.4.6
author: Joe Shimell
main: uk.co.angrybee.joe.DiscordWhitelister
description: Discord Whitelister.