feat(SkinHandler): SkinsRestorer custom skins hook

GeorgeV220 · Mar 17, 2023 · 5762022 · 5762022
1 parent 2dc6ab2
commit 5762022
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 0 deletions.
diff --git a/build.gradle b/build.gradle
@@ -79,6 +79,8 @@ allprojects {
         compileOnly "org.bstats:bstats-velocity:3.0.1"
         compileOnly "org.bstats:bstats-sponge:3.0.1"
 
+        compileOnly 'net.skinsrestorer:skinsrestorer-api:14.2.8'
+
         compileOnly 'org.apache.logging.log4j:log4j-api:2.20.0'
         compileOnly 'net.kyori:adventure-api:4.12.0'
         compileOnly 'net.kyori:adventure-text-serializer-legacy:4.13.0'

diff --git a/bukkit/src/main/java/com/georgev22/skinoverlay/SkinOverlayBukkit.java b/bukkit/src/main/java/com/georgev22/skinoverlay/SkinOverlayBukkit.java
@@ -9,6 +9,7 @@
 import com.georgev22.library.scheduler.SchedulerManager;
 import com.georgev22.skinoverlay.handler.SkinHandler.SkinHandler_;
 import com.georgev22.skinoverlay.handler.handlers.*;
+import com.georgev22.skinoverlay.hook.hooks.SkinsRestorerHook;
 import com.georgev22.skinoverlay.listeners.bukkit.DeveloperInformListener;
 import com.georgev22.skinoverlay.listeners.bukkit.PlayerListeners;
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
@@ -77,6 +78,14 @@ public void onEnable() {
             case UNKNOWN -> SkinOverlay.getInstance().setSkinHandler(new SkinHandler_());
             default -> SkinOverlay.getInstance().setSkinHandler(new SkinHandler_Legacy());
         }
+        switch (OptionsUtil.SKIN_HOOK.getStringValue()) {
+            case "SkinsRestorer" -> {
+                if (getServer().getPluginManager().isPluginEnabled("SkinsRestorer")) {
+                    SkinOverlay.getInstance().setSkinHook(new SkinsRestorerHook());
+                }
+            }
+            default -> SkinOverlay.getInstance().setSkinHook(null);
+        }
         SkinOverlay.getInstance().setCommandManager(new PaperCommandManager(this));
         SkinOverlay.getInstance().onEnable();
         SkinOverlay.getInstance().setupCommands();

diff --git a/bungee/src/main/java/com/georgev22/skinoverlay/SkinOverlayBungee.java b/bungee/src/main/java/com/georgev22/skinoverlay/SkinOverlayBungee.java
@@ -9,6 +9,7 @@
 import com.georgev22.library.scheduler.SchedulerManager;
 import com.georgev22.library.utilities.Utils;
 import com.georgev22.skinoverlay.handler.SkinHandler;
+import com.georgev22.skinoverlay.hook.hooks.SkinsRestorerHook;
 import com.georgev22.skinoverlay.listeners.bungee.DeveloperInformListener;
 import com.georgev22.skinoverlay.listeners.bungee.PlayerListeners;
 import com.georgev22.skinoverlay.utilities.BungeeCordPluginMessageUtils;
@@ -104,6 +105,14 @@ protected <T> GameProfile getGameProfile0(@NotNull PlayerObject playerObject) {
                 return gameProfile;
             }
         });
+        switch (OptionsUtil.SKIN_HOOK.getStringValue()) {
+            case "SkinsRestorer" -> {
+                if (getProxy().getPluginManager().getPlugin("SkinsRestorer") != null) {
+                    SkinOverlay.getInstance().setSkinHook(new SkinsRestorerHook());
+                }
+            }
+            default -> SkinOverlay.getInstance().setSkinHook(null);
+        }
         SkinOverlay.getInstance().setCommandManager(new BungeeCommandManager(this));
         SkinOverlay.getInstance().onEnable();
         SkinOverlay.getInstance().setupCommands();

diff --git a/core/src/main/java/com/georgev22/skinoverlay/SkinOverlay.java b/core/src/main/java/com/georgev22/skinoverlay/SkinOverlay.java
@@ -12,6 +12,7 @@
 import com.georgev22.skinoverlay.commands.SkinOverlayCommand;
 import com.georgev22.skinoverlay.config.FileManager;
 import com.georgev22.skinoverlay.handler.SkinHandler;
+import com.georgev22.skinoverlay.hook.SkinHook;
 import com.georgev22.skinoverlay.utilities.MessagesUtil;
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
 import com.georgev22.skinoverlay.utilities.Updater;
@@ -42,6 +43,10 @@ public class SkinOverlay {
     @Setter
     private SkinHandler skinHandler;
 
+    @Getter
+    @Setter
+    private SkinHook skinHook;
+
     @Getter
     private FileManager fileManager;
 

diff --git a/core/src/main/java/com/georgev22/skinoverlay/handler/SkinHandler.java b/core/src/main/java/com/georgev22/skinoverlay/handler/SkinHandler.java
@@ -252,6 +252,9 @@ public Property getXUIDSkin(final String xuid) throws IOException {
      * @throws InterruptedException When a thread is waiting, sleeping, or otherwise occupied, and the thread is interrupted
      */
     public Property getJavaSkin(final PlayerObject playerObject) throws IOException, ExecutionException, InterruptedException {
+        if (skinOverlay.getSkinHook() != null) {
+            return skinOverlay.getSkinHook().getProperty(playerObject);
+        }
         final JsonElement json = JsonParser.parseString(new String(this.getProfileBytes(playerObject, null)));
         final JsonArray properties = json.getAsJsonObject().get("properties").getAsJsonArray();
         Property property = null;

diff --git a/core/src/main/java/com/georgev22/skinoverlay/hook/SkinHook.java b/core/src/main/java/com/georgev22/skinoverlay/hook/SkinHook.java
@@ -0,0 +1,11 @@
+package com.georgev22.skinoverlay.hook;
+
+import com.georgev22.skinoverlay.utilities.player.PlayerObject;
+import com.mojang.authlib.properties.Property;
+import org.jetbrains.annotations.NotNull;
+
+public interface SkinHook {
+
+    Property getProperty(@NotNull PlayerObject playerObject);
+
+}
diff --git a/core/src/main/java/com/georgev22/skinoverlay/hook/hooks/SkinsRestorerHook.java b/core/src/main/java/com/georgev22/skinoverlay/hook/hooks/SkinsRestorerHook.java
@@ -0,0 +1,29 @@
+package com.georgev22.skinoverlay.hook.hooks;
+
+import com.georgev22.skinoverlay.hook.SkinHook;
+import com.georgev22.skinoverlay.utilities.player.PlayerObject;
+import com.mojang.authlib.properties.Property;
+import net.skinsrestorer.api.SkinsRestorerAPI;
+import net.skinsrestorer.api.property.IProperty;
+import org.jetbrains.annotations.NotNull;
+
+public class SkinsRestorerHook implements SkinHook {
+
+
+    private final SkinsRestorerAPI skinsRestorerAPI;
+
+    public SkinsRestorerHook() {
+        skinsRestorerAPI = SkinsRestorerAPI.getApi();
+    }
+
+    @Override
+    public Property getProperty(@NotNull PlayerObject playerObject) {
+        IProperty iProperty = skinsRestorerAPI.getSkinData(skinsRestorerAPI.getSkinName(playerObject.playerName()));
+        if (iProperty == null) {
+            throw new RuntimeException();
+        }
+        return new Property(iProperty.getName(), iProperty.getValue(), iProperty.getSignature());
+    }
+
+
+}
diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/OptionsUtil.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/OptionsUtil.java
@@ -65,6 +65,7 @@ public enum OptionsUtil {
 
     OVERLAY_HAT("overlays.%s.hat", false, Optional.empty()),
     DEFAULT_SKIN_UUID("default skin uuid", "8667ba71-b85a-4004-af54-457a9734eed7", Optional.empty()),
+    SKIN_HOOK("skin hook", "SkinsRestorer", Optional.empty()),
     ;
     private static final SkinOverlay mainPlugin = SkinOverlay.getInstance();
     private final String pathName;

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -32,6 +32,10 @@ Options:
       password: "yourpassword"
       database: "skinoverlay"
       collection: "skinoverlay_users"
+  #Skin hooks are only used to retrieve player skin properties for offline players or players who have changed their skin.
+  #Currently available Skin Hooks: None, SkinsRestorer and Custom.
+  #With the custom option, you need to have your own plugin that sets the SkinOverlay.getInstance().setSkinHook(SkinHook).
+  skin hook: None
   overlays:
     policeman:
       hat: true

diff --git a/velocity/src/main/java/com/georgev22/skinoverlay/SkinOverlayVelocity.java b/velocity/src/main/java/com/georgev22/skinoverlay/SkinOverlayVelocity.java
@@ -9,6 +9,7 @@
 import com.georgev22.library.scheduler.SchedulerManager;
 import com.georgev22.library.utilities.Utils;
 import com.georgev22.skinoverlay.handler.SkinHandler;
+import com.georgev22.skinoverlay.hook.hooks.SkinsRestorerHook;
 import com.georgev22.skinoverlay.listeners.velocity.DeveloperInformListener;
 import com.georgev22.skinoverlay.listeners.velocity.PlayerListeners;
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
@@ -139,6 +140,14 @@ protected <T> GameProfile getGameProfile0(@NotNull PlayerObject playerObject) {
                 return gameProfile;
             }
         });
+        switch (OptionsUtil.SKIN_HOOK.getStringValue()) {
+            case "SkinsRestorer" -> {
+                if (getProxy().getPluginManager().getPlugin("skinsrestorer").isPresent()) {
+                    SkinOverlay.getInstance().setSkinHook(new SkinsRestorerHook());
+                }
+            }
+            default -> SkinOverlay.getInstance().setSkinHook(null);
+        }
         SkinOverlay.getInstance().setCommandManager(new VelocityCommandManager(getProxy(), this, dataFolder()));
         SkinOverlay.getInstance().onEnable();
         SkinOverlay.getInstance().setupCommands();