From 27aa077116b845e016cb48a108fa85b2a2b3a7d5 Mon Sep 17 00:00:00 2001 From: James Lyne Date: Fri, 7 Jan 2022 22:53:18 +0000 Subject: [PATCH 1/2] Add %uuid% placeholder for skin-url --- DynmapCore/src/main/java/org/dynmap/PlayerFaces.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/java/org/dynmap/PlayerFaces.java b/DynmapCore/src/main/java/org/dynmap/PlayerFaces.java index 987bd20f..50e99aec 100644 --- a/DynmapCore/src/main/java/org/dynmap/PlayerFaces.java +++ b/DynmapCore/src/main/java/org/dynmap/PlayerFaces.java @@ -108,10 +108,12 @@ public class PlayerFaces { private class LoadPlayerImages implements Runnable { private SkinUrlProvider mSkinUrlProvider; public final String playername; + public final UUID playeruuid; public final String playerskinurl; public LoadPlayerImages(String playername, String playerskinurl, UUID playeruuid, SkinUrlProvider skinUrlProvider) { this.playername = playername; + this.playeruuid = playeruuid; this.playerskinurl = playerskinurl; mSkinUrlProvider = skinUrlProvider; } @@ -131,7 +133,8 @@ public class PlayerFaces { if (mSkinUrlProvider == null) { if (!skinurl.equals("")) { - url = new URL(skinurl.replace("%player%", URLEncoder.encode(playername, "UTF-8"))); + url = new URL(skinurl.replace("%player%", URLEncoder.encode(playername, "UTF-8")) + .replace("%uuid%", playeruuid.toString())); } else if (playerskinurl != null) { url = new URL(playerskinurl); } From 44549eb31630ef74debb0373ac52410805836c5b Mon Sep 17 00:00:00 2001 From: James Lyne Date: Fri, 7 Jan 2022 23:01:29 +0000 Subject: [PATCH 2/2] Update configuration.txt comment --- fabric-1.14.4/src/main/resources/configuration.txt | 2 +- fabric-1.15.2/src/main/resources/configuration.txt | 2 +- fabric-1.16.4/src/main/resources/configuration.txt | 2 +- fabric-1.17.1/src/main/resources/configuration.txt | 2 +- fabric-1.18/src/main/resources/configuration.txt | 2 +- forge-1.11.2/src/main/resources/configuration.txt | 2 +- forge-1.12.2/src/main/resources/configuration.txt | 2 +- forge-1.13.2/src/main/resources/configuration.txt | 2 +- forge-1.14.4/src/main/resources/configuration.txt | 2 +- forge-1.15.2/src/main/resources/configuration.txt | 2 +- forge-1.16.5/src/main/resources/configuration.txt | 2 +- forge-1.17.1/src/main/resources/configuration.txt | 2 +- forge-1.18/src/main/resources/configuration.txt | 2 +- spigot/src/main/resources/configuration.txt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fabric-1.14.4/src/main/resources/configuration.txt b/fabric-1.14.4/src/main/resources/configuration.txt index 60061af7..64eb49ed 100644 --- a/fabric-1.14.4/src/main/resources/configuration.txt +++ b/fabric-1.14.4/src/main/resources/configuration.txt @@ -280,7 +280,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/fabric-1.15.2/src/main/resources/configuration.txt b/fabric-1.15.2/src/main/resources/configuration.txt index 60061af7..64eb49ed 100644 --- a/fabric-1.15.2/src/main/resources/configuration.txt +++ b/fabric-1.15.2/src/main/resources/configuration.txt @@ -280,7 +280,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/fabric-1.16.4/src/main/resources/configuration.txt b/fabric-1.16.4/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/fabric-1.16.4/src/main/resources/configuration.txt +++ b/fabric-1.16.4/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/fabric-1.17.1/src/main/resources/configuration.txt b/fabric-1.17.1/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/fabric-1.17.1/src/main/resources/configuration.txt +++ b/fabric-1.17.1/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/fabric-1.18/src/main/resources/configuration.txt b/fabric-1.18/src/main/resources/configuration.txt index 1c144124..3c148a0c 100644 --- a/fabric-1.18/src/main/resources/configuration.txt +++ b/fabric-1.18/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.11.2/src/main/resources/configuration.txt b/forge-1.11.2/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/forge-1.11.2/src/main/resources/configuration.txt +++ b/forge-1.11.2/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.12.2/src/main/resources/configuration.txt b/forge-1.12.2/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/forge-1.12.2/src/main/resources/configuration.txt +++ b/forge-1.12.2/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.13.2/src/main/resources/configuration.txt b/forge-1.13.2/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/forge-1.13.2/src/main/resources/configuration.txt +++ b/forge-1.13.2/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.14.4/src/main/resources/configuration.txt b/forge-1.14.4/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/forge-1.14.4/src/main/resources/configuration.txt +++ b/forge-1.14.4/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.15.2/src/main/resources/configuration.txt b/forge-1.15.2/src/main/resources/configuration.txt index b53b60b7..feb44ad5 100644 --- a/forge-1.15.2/src/main/resources/configuration.txt +++ b/forge-1.15.2/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.16.5/src/main/resources/configuration.txt b/forge-1.16.5/src/main/resources/configuration.txt index 612dbbc5..6498ba67 100644 --- a/forge-1.16.5/src/main/resources/configuration.txt +++ b/forge-1.16.5/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.17.1/src/main/resources/configuration.txt b/forge-1.17.1/src/main/resources/configuration.txt index 612dbbc5..6498ba67 100644 --- a/forge-1.17.1/src/main/resources/configuration.txt +++ b/forge-1.17.1/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/forge-1.18/src/main/resources/configuration.txt b/forge-1.18/src/main/resources/configuration.txt index 612dbbc5..6498ba67 100644 --- a/forge-1.18/src/main/resources/configuration.txt +++ b/forge-1.18/src/main/resources/configuration.txt @@ -288,7 +288,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south) diff --git a/spigot/src/main/resources/configuration.txt b/spigot/src/main/resources/configuration.txt index 7eaba012..c1898867 100644 --- a/spigot/src/main/resources/configuration.txt +++ b/spigot/src/main/resources/configuration.txt @@ -289,7 +289,7 @@ custom-colors-support: true # Control updating of player faces, once loaded (if faces are being managed by other apps or manually) #refreshskins: false -# Customize URL used for fetching player skins (%player% is macro for name) +# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID) skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png" # Enable skins via SkinsRestorer plugin instead of internal legacy implementation (disabled by default)