Integrations: add SkinsRestorer support

build.gradle

@@ -12,6 +12,10 @@ repositories {
         name = "spigotmc-repo"
         url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
     }
+    maven {
+        name 'codemc'
+        url 'https://repo.codemc.org/repository/maven-public/'
+    }
     maven {
         name = "sonatype"
         url = "https://oss.sonatype.org/content/groups/public/"
@@ -56,6 +60,8 @@ dependencies {
 
     compileOnly "su.plo.voice.api:server:2.0.3"
 
+    compileOnly 'net.skinsrestorer:skinsrestorer-api:15.0.4'
+
     compileOnly "com.loohp:InteractiveChat:4.2.7.2"
     compileOnly "com.github.MilkBowl:VaultAPI:1.7.1"
     compileOnly "me.clip:placeholderapi:2.11.3"

src/main/java/net/flectone/chat/module/integrations/FSkinsRestorer.java

@@ -0,0 +1,38 @@
+package net.flectone.chat.module.integrations;
+
+import net.skinsrestorer.api.PropertyUtils;
+import net.skinsrestorer.api.SkinsRestorer;
+import net.skinsrestorer.api.SkinsRestorerProvider;
+import net.skinsrestorer.api.exception.DataRequestException;
+import net.skinsrestorer.api.property.SkinProperty;
+import net.skinsrestorer.api.storage.PlayerStorage;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+
+public class FSkinsRestorer implements FIntegration{
+
+    private SkinsRestorer skinsRestorer;
+
+    public FSkinsRestorer() {
+        init();
+    }
+
+    @Override
+    public void init() {
+        skinsRestorer = SkinsRestorerProvider.get();
+    }
+
+    @Nullable
+    public String getTextureId(@NotNull Player player) {
+        PlayerStorage storage = skinsRestorer.getPlayerStorage();
+        try {
+            Optional<SkinProperty> skin = storage.getSkinForPlayer(player.getUniqueId(), player.getName());
+            return skin.map(PropertyUtils::getSkinTextureUrlStripped).orElse(null);
+        } catch (DataRequestException e) {
+            return null;
+        }
+    }
+}

src/main/java/net/flectone/chat/module/integrations/IntegrationsModule.java

@@ -63,6 +63,9 @@ public void init() {
         if (isPluginEnabled("VoiceChat")) {
             INTEGRATIONS_MAP.put("VoiceChat", new FSimpleVoiceChat());
         }
+        if (isPluginEnabled("SkinsRestorer")) {
+            INTEGRATIONS_MAP.put("SkinsRestorer", new FSkinsRestorer());
+        }
     }
 
     private static FIntegration get(String integration) {
@@ -74,6 +77,13 @@ private boolean isPluginEnabled(String plugin) {
                 && integrations.getBoolean(plugin + ".enable");
     }
 
+    @Nullable
+    public static String getTextureId(@NotNull Player player) {
+        FIntegration skinsRestorer = get("SkinsRestorer");
+        if (skinsRestorer != null) return ((FSkinsRestorer) skinsRestorer).getTextureId(player);
+        return null;
+    }
+
     public static boolean isVanished(@NotNull Player player) {
         return player.getMetadata("vanished").parallelStream()
                 .anyMatch(MetadataValue::asBoolean);

src/main/java/net/flectone/chat/util/PlayerUtil.java

@@ -17,7 +17,7 @@
 
 public class PlayerUtil {
 
-    private static final String WEBSITE_AVATAR_URL = "https://cravatar.eu/avatar/<player>/8.png";
+    private static final String WEBSITE_AVATAR_URL = "https://mc-heads.net/avatar/<player>/8.png";
 
     public static String getIP(Player player) {
         try {
@@ -93,6 +93,9 @@ public static Collection<? extends Player> getPlayersWithFeature(@NotNull Collec
 
     @NotNull
     public static String constructAvatarUrl(@NotNull Player player) {
-        return WEBSITE_AVATAR_URL.replace("<player>", player.getUniqueId().toString());
+        String replacement = IntegrationsModule.getTextureId(player);
+        if (replacement == null) replacement = player.getUniqueId().toString();
+
+        return WEBSITE_AVATAR_URL.replace("<player>", replacement);
     }
 }

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ main: net.flectone.chat.FlectoneChat
 api-version: '1.16'
 authors: [ TheFaser, fxd ]
 website: https://chat.flectone.net/
-softdepend: [ DiscordSRV, PlaceholderAPI, InteractiveChat, LuckPerms, SuperVanish, Vault, PlasmoVoice, voicechat ]
+softdepend: [ DiscordSRV, PlaceholderAPI, InteractiveChat, LuckPerms, SuperVanish, Vault, PlasmoVoice, voicechat, SkinsRestorer ]
 
 permissions:
 

src/main/resources/settings/integrations.yml

@@ -20,6 +20,8 @@ PlasmoVoice:
   enable: true
 VoiceChat:
   enable: true
+SkinsRestorer:
+  enable: true
 DiscordSRV:
   enable: true
   features: [ swear-protection, patterns, formatting ]