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

Merge pull request #3307 from stepech/v3.0

Browse source 
Update SkinsRestorer hook to v14 API
This commit is contained in:
mikeprimm 2021-03-11 20:33:33 -06:00 • committed by GitHub
commit ab7b9105d4
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spigot/build.gradle
View file

@ -15,7 +15,7 @@ dependencies {
compile 'me.lucko.luckperms:luckperms-api:4.3' compile 'me.lucko.luckperms:luckperms-api:4.3'
compile 'net.luckperms:api:5.0' compile 'net.luckperms:api:5.0'
compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } 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(":dynmap-api")
compile project(path: ":DynmapCore", configuration: "shadow") compile project(path: ":DynmapCore", configuration: "shadow")
compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'

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

@ -105,7 +105,7 @@ 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 skinsrestorer.bukkit.SkinsRestorer; 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;
@ -140,7 +140,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private BukkitWorld last_bworld; private BukkitWorld last_bworld;
private BukkitVersionHelper helper; private BukkitVersionHelper helper;
private final BukkitWorld getWorldByName(String name) { private final BukkitWorld getWorldByName(String name) {
if((last_world != null) && (last_world.getName().equals(name))) { if((last_world != null) && (last_world.getName().equals(name))) {
return last_bworld; return last_bworld;
@ -911,13 +911,18 @@ 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)) {
SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer"); try {
SkinsRestorer skinsRestorer = (SkinsRestorer) getServer().getPluginManager().getPlugin("SkinsRestorer");
if (skinsRestorer == null) { if (skinsRestorer == null) {
Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed"); Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
} else { } else {
skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer); skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer);
Log.info("SkinsRestorer integration enabled"); 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");
} }
} }

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

@ -4,9 +4,9 @@ import org.dynmap.SkinUrlProvider;
import org.json.simple.parser.JSONParser; 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 skinsrestorer.bukkit.SkinsRestorer; import net.skinsrestorer.api.SkinsRestorerAPI;
import skinsrestorer.bukkit.SkinsRestorerBukkitAPI; import net.skinsrestorer.bukkit.SkinsRestorer;
import skinsrestorer.shared.utils.ReflectionUtil; import net.skinsrestorer.shared.utils.ReflectionUtil;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
@ -15,7 +15,7 @@ import java.util.Base64;
public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider { public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
private JSONParser mJsonParser; private JSONParser mJsonParser;
private SkinsRestorerBukkitAPI mSkinsRestorerApi; private SkinsRestorerAPI mSkinsRestorerApi;
SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) { SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) {
mJsonParser = new JSONParser(); mJsonParser = new JSONParser();
@ -59,4 +59,4 @@ public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
return null; return null;
} }
} }