mirror of https://github.com/webbukkit/dynmap.git
dependency: Update SkinsRestorer
This commit is contained in:
parent
d5354898cb
commit
9ebb6b514f
|
@ -5,7 +5,7 @@ repositories {
|
||||||
url 'https://jitpack.io'
|
url 'https://jitpack.io'
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
url 'https://repo.codemc.org/repository/maven-snapshots'
|
url 'https://repo.codemc.org/repository/maven-releases/'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ dependencies {
|
||||||
implementation 'me.lucko.luckperms:luckperms-api:4.3'
|
implementation 'me.lucko.luckperms:luckperms-api:4.3'
|
||||||
implementation 'net.luckperms:api:5.0'
|
implementation 'net.luckperms:api:5.0'
|
||||||
implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
|
implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
|
||||||
compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar'
|
compileOnly 'net.skinsrestorer:skinsrestorer-api:14.1.+'
|
||||||
implementation project(":dynmap-api")
|
implementation project(":dynmap-api")
|
||||||
implementation project(path: ":DynmapCore", configuration: "shadow")
|
implementation project(path: ":DynmapCore", configuration: "shadow")
|
||||||
implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
|
implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
|
||||||
|
|
|
@ -110,7 +110,6 @@ import org.dynmap.renderer.DynmapBlockState;
|
||||||
import org.dynmap.utils.MapChunkCache;
|
import org.dynmap.utils.MapChunkCache;
|
||||||
import org.dynmap.utils.Polygon;
|
import org.dynmap.utils.Polygon;
|
||||||
import org.dynmap.utils.VisibilityLimit;
|
import org.dynmap.utils.VisibilityLimit;
|
||||||
import net.skinsrestorer.bukkit.SkinsRestorer;
|
|
||||||
|
|
||||||
public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
|
public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
|
||||||
private DynmapCore core;
|
private DynmapCore core;
|
||||||
|
@ -959,18 +958,24 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
|
||||||
SkinsRestorerSkinUrlProvider skinUrlProvider = null;
|
SkinsRestorerSkinUrlProvider skinUrlProvider = null;
|
||||||
|
|
||||||
if (core.configuration.getBoolean("skinsrestorer-integration", false)) {
|
if (core.configuration.getBoolean("skinsrestorer-integration", false)) {
|
||||||
try {
|
|
||||||
SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer");
|
|
||||||
|
|
||||||
if (skinsRestorer == null) {
|
Plugin skinsRestorer = getServer().getPluginManager().getPlugin("SkinsRestorer");
|
||||||
Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
|
|
||||||
} else {
|
if (skinsRestorer == null) {
|
||||||
|
Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer is not installed");
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
skinUrlProvider = new SkinsRestorerSkinUrlProvider();
|
skinUrlProvider = new SkinsRestorerSkinUrlProvider();
|
||||||
Log.info("SkinsRestorer API v14 integration enabled");
|
Log.info("SkinsRestorer API integration enabled");
|
||||||
|
} catch (NoClassDefFoundError e) {
|
||||||
|
skinUrlProvider = null;
|
||||||
|
Log.warning("You are using unsupported version of SkinsRestorer. Use v14.1 or newer.");
|
||||||
|
Log.warning("Disabled SkinsRestorer integration for this session");
|
||||||
|
} catch (Throwable e) {
|
||||||
|
// SkinsRestorer probably updated its API
|
||||||
|
skinUrlProvider = null;
|
||||||
|
Log.warning("Error while enabling SkinsRestorer integration", 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");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,7 @@ import org.json.simple.parser.JSONParser;
|
||||||
import org.json.simple.parser.ParseException;
|
import org.json.simple.parser.ParseException;
|
||||||
import org.json.simple.JSONObject;
|
import org.json.simple.JSONObject;
|
||||||
import net.skinsrestorer.api.SkinsRestorerAPI;
|
import net.skinsrestorer.api.SkinsRestorerAPI;
|
||||||
import net.skinsrestorer.bukkit.SkinsRestorer;
|
import net.skinsrestorer.api.reflection.ReflectionUtil;
|
||||||
import net.skinsrestorer.shared.utils.ReflectionUtil;
|
|
||||||
|
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
Loading…
Reference in New Issue