Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dependency: Update SkinsRestorer

Browse source
This commit is contained in:
stepech 2021-12-11 14:35:29 +01:00
parent d5354898cb
commit 9ebb6b514f
No known key found for this signature in database
GPG key ID: BF9C52F092217769
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View file

@ -110,7 +110,6 @@ import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon;
import org.dynmap.utils.VisibilityLimit;
import net.skinsrestorer.bukkit.SkinsRestorer;
public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private DynmapCore core;
@ -959,18 +958,24 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
SkinsRestorerSkinUrlProvider skinUrlProvider = null;
if (core.configuration.getBoolean("skinsrestorer-integration", false)) {
try {
SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer");
if (skinsRestorer == null) {
Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
} else {
Plugin skinsRestorer = getServer().getPluginManager().getPlugin("SkinsRestorer");
if (skinsRestorer == null) {
Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer is not installed");
} else {
try {
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");
}
}

3
spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
View file

@ -5,8 +5,7 @@ import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.json.simple.JSONObject;
import net.skinsrestorer.api.SkinsRestorerAPI;
import net.skinsrestorer.bukkit.SkinsRestorer;
import net.skinsrestorer.shared.utils.ReflectionUtil;
import net.skinsrestorer.api.reflection.ReflectionUtil;
import java.net.MalformedURLException;
import java.net.URL;