From 04c494f127843cd4a3c869ead5f17df89d6739b5 Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Sun, 20 Jun 2021 09:16:59 -0700 Subject: [PATCH 1/2] Update SkinsRestorer dependency to v14.1.0-SNAPSHOT --- spigot/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spigot/build.gradle b/spigot/build.gradle index 2a5e559c..18b2e554 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 'net.skinsrestorer:skinsrestorer:14.0.0-SNAPSHOT@jar' + compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar' compile project(":dynmap-api") compile project(path: ":DynmapCore", configuration: "shadow") compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' From 788a78bbe0fbbcbfd7fbd5670152eb4eddde3afb Mon Sep 17 00:00:00 2001 From: Kian Kasad Date: Sun, 20 Jun 2021 09:22:07 -0700 Subject: [PATCH 2/2] Use updated method of getting SkinsRestorer API --- spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java | 4 ++-- .../java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java index ec4d72f9..b095e908 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java +++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java @@ -917,10 +917,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { if (skinsRestorer == null) { Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed"); } else { - skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer); + skinUrlProvider = new SkinsRestorerSkinUrlProvider(); Log.info("SkinsRestorer API v14 integration enabled"); } - }catch(NoClassDefFoundError e) { + } 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 a1d65291..f3ac7ffd 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java +++ b/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java @@ -17,9 +17,9 @@ public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider { private JSONParser mJsonParser; private SkinsRestorerAPI mSkinsRestorerApi; - SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) { + SkinsRestorerSkinUrlProvider() { mJsonParser = new JSONParser(); - mSkinsRestorerApi = skinsRestorer.getSkinsRestorerBukkitAPI(); + mSkinsRestorerApi = SkinsRestorerAPI.getApi(); } @Override