Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2896 from owlnull/v3.0 

Add skins support via SkinsRestorer plugin
This commit is contained in:
mikeprimm 2020-05-16 16:18:17 -05:00 committed by GitHub
parent 6fcfa7c3e6 c7cb56bc1d
commit f151cdc84f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 121 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@ -104,6 +103,7 @@ public class DynmapCore implements DynmapCommonAPI {
public ComponentManager componentManager = new ComponentManager();
public DynmapListenerManager listenerManager = new DynmapListenerManager(this);
public PlayerFaces playerfacemgr;
public SkinUrlProvider skinUrlProvider;
public Events events = new Events();
public String deftemplatesuffix = "";
private DynmapMapCommands dmapcmds = new DynmapMapCommands();
@ -155,6 +155,10 @@ public class DynmapCore implements DynmapCommonAPI {
/* Constructor for core */
public DynmapCore() {
}
public void setSkinUrlProvider(SkinUrlProvider skinUrlProvider) {
this.skinUrlProvider = skinUrlProvider;
}
/* Cleanup method */
public void cleanup() {

32
DynmapCore/src/main/java/org/dynmap/PlayerFaces.java
View File

@ -106,12 +106,16 @@ public class PlayerFaces {
}
private class LoadPlayerImages implements Runnable {
private SkinUrlProvider mSkinUrlProvider;
public final String playername;
public final String playerskinurl;
public LoadPlayerImages(String playername, String playerskinurl, UUID playeruuid) {
public LoadPlayerImages(String playername, String playerskinurl, UUID playeruuid, SkinUrlProvider skinUrlProvider) {
this.playername = playername;
this.playerskinurl = playerskinurl;
mSkinUrlProvider = skinUrlProvider;
}
public void run() {
boolean has_8x8 = storage.hasPlayerFaceImage(playername, FaceType.FACE_8X8);
boolean has_16x16 = storage.hasPlayerFaceImage(playername, FaceType.FACE_16X16);
@ -123,16 +127,20 @@ public class PlayerFaces {
BufferedImage img = null;
try {
if(fetchskins && (refreshskins || missing_any)) {
URL url = null;
if (skinurl.equals("") == false) {
url = new URL(skinurl.replace("%player%", URLEncoder.encode(playername, "UTF-8")));
}
else if (playerskinurl != null) {
url = new URL(playerskinurl);
}
if (url != null) {
img = ImageIO.read(url); /* Load skin for player */
}
URL url = null;
if (mSkinUrlProvider == null) {
if (!skinurl.equals("")) {
url = new URL(skinurl.replace("%player%", URLEncoder.encode(playername, "UTF-8")));
} else if (playerskinurl != null) {
url = new URL(playerskinurl);
}
} else {
url = mSkinUrlProvider.getSkinUrl(playername);
}
if (url != null)
img = ImageIO.read(url); /* Load skin for player */
}
} catch (IOException iox) {
Debug.debug("Error loading skin for '" + playername + "' - " + iox);
@ -292,7 +300,7 @@ public class PlayerFaces {
core.listenerManager.addListener(EventType.PLAYER_JOIN, new PlayerEventListener() {
@Override
public void playerEvent(DynmapPlayer p) {
Runnable job = new LoadPlayerImages(p.getName(), p.getSkinURL(), p.getUUID());
Runnable job = new LoadPlayerImages(p.getName(), p.getSkinURL(), p.getUUID(), core.skinUrlProvider);
if(fetchskins)
MapManager.scheduleDelayedJob(job, 0);
else

7
DynmapCore/src/main/java/org/dynmap/SkinUrlProvider.java Normal file
View File

@ -0,0 +1,7 @@
package org.dynmap;
import java.net.URL;
public interface SkinUrlProvider {
URL getSkinUrl(String playerName);
}

6
spigot/build.gradle
View File

@ -5,14 +5,18 @@ repositories {
maven {
url 'https://jitpack.io'
}
maven {
url 'https://repo.codemc.org/repository/maven-snapshots'
}
}
dependencies {
compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
compile 'com.nijikokun.bukkit:Permissions:3.1.6'
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'
compile project(":dynmap-api")
compile project(path: ":DynmapCore", configuration: "shadow")
compile group: 'ru.tehkode', name: 'PermissionsEx', version:'1.19.1'

18
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -105,6 +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;
public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private DynmapCore core;
@ -896,6 +897,23 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
this.setEnabled(false);
return;
}
/* Skins support via SkinsRestorer */
SkinsRestorerSkinUrlProvider skinUrlProvider = null;
if (core.configuration.getBoolean("skinsrestorer-integration", false)) {
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");
}
}
core.setSkinUrlProvider(skinUrlProvider);
/* See if we need to wait before enabling core */
if(!readyToEnable()) {
Listener pl = new Listener() {

62
spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java Normal file
View File

@ -0,0 +1,62 @@
package org.dynmap.bukkit;
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 java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
private JSONParser mJsonParser;
private SkinsRestorerBukkitAPI mSkinsRestorerApi;
SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) {
mJsonParser = new JSONParser();
mSkinsRestorerApi = skinsRestorer.getSkinsRestorerBukkitAPI();
}
@Override
public URL getSkinUrl(String playerName) {
String skinName = mSkinsRestorerApi.getSkinName(playerName);
Object skinDataProperty = mSkinsRestorerApi.getSkinData(skinName == null ? playerName : skinName);
if (skinDataProperty == null)
return null;
String skinDataPropertyValue;
try {
skinDataPropertyValue = (String) ReflectionUtil.invokeMethod(skinDataProperty, "getValue");
} catch (Exception ex) {
ex.printStackTrace();
return null;
}
byte[] skinDataBytes = Base64.getDecoder().decode(skinDataPropertyValue);
JSONObject skinData;
try {
skinData = (JSONObject) mJsonParser.parse(new String(skinDataBytes, StandardCharsets.UTF_8));
} catch (ParseException ex) {
ex.printStackTrace();
return null;
}
try {
return new URL((String) ((JSONObject) ((JSONObject) skinData.get("textures")).get("SKIN")).get("url"));
} catch (MalformedURLException ex) {
ex.printStackTrace();
}
return null;
}
}

3
spigot/src/main/resources/configuration.txt
View File

@ -281,6 +281,9 @@ custom-colors-support: true
# Customize URL used for fetching player skins (%player% is macro for name)
skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png"
# Enable skins via SkinsRestorer plugin instead of internal legacy implementation (disabled by default)
#skinsrestorer-integration: true
render-triggers:
#- playermove
#- playerjoin

2
spigot/src/main/resources/plugin.yml
View File

@ -3,7 +3,7 @@ main: org.dynmap.bukkit.DynmapPlugin
version: "${version}-${buildnumber}"
authors: [mikeprimm]
website: "https://www.reddit.com/r/Dynmap/"
softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit, GroupManager, LuckPerms, Vault ]
softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit, GroupManager, LuckPerms, Vault, SkinsRestorer ]
commands:
dynmap:
description: Controls Dynmap.