From 0ae5694ae60454448d0f5aacaffcc692d2688032 Mon Sep 17 00:00:00 2001
From: stepech <29132060+stepech@users.noreply.github.com>
Date: Thu, 4 Mar 2021 20:49:47 +0100
Subject: [PATCH] Update SkinsRestorer hook to v14 API

---
 spigot/build.gradle                           |  2 +-
 .../java/org/dynmap/bukkit/DynmapPlugin.java  | 21 ++++++++++++-------
 .../bukkit/SkinsRestorerSkinUrlProvider.java  | 10 ++++-----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/spigot/build.gradle b/spigot/build.gradle
index 25b17f70..94cd4451 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     compile 'me.lucko.luckperms:luckperms-api:4.3'
     compile 'net.luckperms:api:5.0'
     compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
-    compileOnly 'com:skinsrestorer:13.7.5-20191221.213031-7@jar'
+    compileOnly 'net.skinsrestorer:skinsrestorer:14.0.0-SNAPSHOT@jar'
     compile project(":dynmap-api")
     compile project(path: ":DynmapCore", configuration: "shadow")
     compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
index d8af8638..ec4d72f9 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
@@ -105,7 +105,7 @@ import org.dynmap.renderer.DynmapBlockState;
 import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.Polygon;
 import org.dynmap.utils.VisibilityLimit;
-import skinsrestorer.bukkit.SkinsRestorer;
+import net.skinsrestorer.bukkit.SkinsRestorer;
 
 public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private DynmapCore core;
@@ -140,7 +140,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private BukkitWorld last_bworld;
     
     private BukkitVersionHelper helper;
-    
+
     private final BukkitWorld getWorldByName(String name) {
         if((last_world != null) && (last_world.getName().equals(name))) {
             return last_bworld;
@@ -911,13 +911,18 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         SkinsRestorerSkinUrlProvider skinUrlProvider = null;
 
         if (core.configuration.getBoolean("skinsrestorer-integration", false)) {
-            SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer");
+            try {
+                SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer");
 
-            if (skinsRestorer == null) {
-                Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
-            } else {
-                skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer);
-                Log.info("SkinsRestorer integration enabled");
+                if (skinsRestorer == null) {
+                    Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
+                } else {
+                    skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer);
+                    Log.info("SkinsRestorer API v14 integration enabled");
+                }
+            }catch(NoClassDefFoundError e) {
+                Log.warning("You are using unsupported version of SkinsRestorer. Use v14 or newer.");
+                Log.warning("Disabled SkinsRestorer integration for this session");
             }
         }
 
diff --git a/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java b/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
index a1336fc1..a1d65291 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
@@ -4,9 +4,9 @@ import org.dynmap.SkinUrlProvider;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.json.simple.JSONObject;
-import skinsrestorer.bukkit.SkinsRestorer;
-import skinsrestorer.bukkit.SkinsRestorerBukkitAPI;
-import skinsrestorer.shared.utils.ReflectionUtil;
+import net.skinsrestorer.api.SkinsRestorerAPI;
+import net.skinsrestorer.bukkit.SkinsRestorer;
+import net.skinsrestorer.shared.utils.ReflectionUtil;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -15,7 +15,7 @@ import java.util.Base64;
 
 public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
     private JSONParser mJsonParser;
-    private SkinsRestorerBukkitAPI mSkinsRestorerApi;
+    private SkinsRestorerAPI mSkinsRestorerApi;
 
     SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) {
         mJsonParser = new JSONParser();
@@ -59,4 +59,4 @@ public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
 
         return null;
     }
-}
\ No newline at end of file
+}