From 46757857fe709a88bbeac0faebfe6e5f8c14c63b Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 18:19:33 +0300 Subject: [PATCH 1/6] add papi support --- pom.xml | 232 +++++++++--------- .../BlueMapCustomSkinProvider.java | 2 + .../bluemapcustomskinprovider/PAPIUtil.java | 16 ++ src/main/resources/plugin.yml | 2 + 4 files changed, 141 insertions(+), 111 deletions(-) create mode 100644 src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java diff --git a/pom.xml b/pom.xml index c30fec9..1a0a19a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,120 +1,130 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.technicjelle - BlueMapCustomSkinProvider - 1.6 - jar + com.technicjelle + BlueMapCustomSkinProvider + 1.6 + jar - BlueMapCustomSkinProvider + BlueMapCustomSkinProvider - A paper plugin to use a custom skin server for BlueMap - - 16 - UTF-8 - - https://github.com/TechnicJelle/BlueMapCustomSkinProvider + A paper plugin to use a custom skin server for BlueMap + + 16 + UTF-8 + + https://github.com/TechnicJelle/BlueMapCustomSkinProvider - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - ${java.version} - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - - - org.bstats - com.technicjelle.bluemapcustomskinprovider.shadow.bstats - - - - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${java.version} + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + + org.bstats + com.technicjelle.bluemapcustomskinprovider.shadow.bstats + + + + + + package + + shade + + + false + + + + + + + + src/main/resources + true + + + - - - papermc-repo - https://repo.papermc.io/repository/maven-public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - bluecolored-releases - BlueColored Repository - https://repo.bluecolored.de/releases - - + + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + papermc-repo + https://repo.papermc.io/repository/maven-public/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ + + + bluecolored-releases + BlueColored Repository + https://repo.bluecolored.de/releases + + - - - com.technicjelle - UpdateChecker - 2.5.1 - compile - - - com.technicjelle - MCUtils - 2.0 - compile - - - com.destroystokyo.paper - paper-api - 1.13-R0.1-SNAPSHOT - provided - - - de.bluecolored.bluemap - BlueMapAPI - 2.7.2 - provided - - - org.jetbrains - annotations - 23.1.0 - compile - - - org.bstats - bstats-bukkit - 3.0.3 - compile - - + + + me.clip + placeholderapi + 2.11.6 + provided + + + com.technicjelle + UpdateChecker + 2.5.1 + compile + + + com.technicjelle + MCUtils + 2.0 + compile + + + com.destroystokyo.paper + paper-api + 1.13-R0.1-SNAPSHOT + provided + + + de.bluecolored.bluemap + BlueMapAPI + 2.7.2 + provided + + + org.jetbrains + annotations + 23.1.0 + compile + + + org.bstats + bstats-bukkit + 3.0.3 + compile + + diff --git a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java index 13ddc17..f5b25c7 100644 --- a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java +++ b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java @@ -4,6 +4,7 @@ import de.bluecolored.bluemap.api.BlueMapAPI; import de.bluecolored.bluemap.api.plugin.SkinProvider; import org.bstats.bukkit.Metrics; +import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; @@ -56,6 +57,7 @@ public void onEnable() { .replace("{UUID}", uuid) .replace("{USERNAME}", username) .replace("{UUID-}", uuid.replace("-", "")); + localUrl = PAPIUtil.processPAPI(Bukkit.getPlayer(playerUUID), localUrl); getLogger().info("Downloading skin for " + username + " from " + localUrl); BufferedImage img = downloadImage(localUrl); return Optional.ofNullable(img); diff --git a/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java b/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java new file mode 100644 index 0000000..1a2b68d --- /dev/null +++ b/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java @@ -0,0 +1,16 @@ +package com.technicjelle.bluemapcustomskinprovider; + +import me.clip.placeholderapi.PlaceholderAPI; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +public final class PAPIUtil { + private PAPIUtil() {} + + public static String processPAPI(Player player, String str) { + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null && player != null) { + return PlaceholderAPI.setPlaceholders(player, str); + } + else return str; + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 28a996d..0aa26bb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,6 +4,8 @@ main: com.technicjelle.bluemapcustomskinprovider.BlueMapCustomSkinProvider api-version: 1.13 depend: - BlueMap +softdepend: + - PlaceholderAPI authors: [ TechnicJelle ] description: ${project.description} website: ${project.url} From 157e4b2db0e2386f6c3fa6ddf8d2e35be42665a3 Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 18:48:53 +0300 Subject: [PATCH 2/6] Add log information --- .../BlueMapCustomSkinProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java index f5b25c7..2a71138 100644 --- a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java +++ b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java @@ -60,6 +60,12 @@ public void onEnable() { localUrl = PAPIUtil.processPAPI(Bukkit.getPlayer(playerUUID), localUrl); getLogger().info("Downloading skin for " + username + " from " + localUrl); BufferedImage img = downloadImage(localUrl); + if (img != null) { + getLogger().info("Skin has been download for player " + username); + } + else { + getLogger().warning("Failed to download skin for player " + username); + } return Optional.ofNullable(img); }; From 516aad21611a43165df5ed93bd6397d5c606779e Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 19:14:23 +0300 Subject: [PATCH 3/6] remove log information --- .../BlueMapCustomSkinProvider.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java index 2a71138..f5b25c7 100644 --- a/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java +++ b/src/main/java/com/technicjelle/bluemapcustomskinprovider/BlueMapCustomSkinProvider.java @@ -60,12 +60,6 @@ public void onEnable() { localUrl = PAPIUtil.processPAPI(Bukkit.getPlayer(playerUUID), localUrl); getLogger().info("Downloading skin for " + username + " from " + localUrl); BufferedImage img = downloadImage(localUrl); - if (img != null) { - getLogger().info("Skin has been download for player " + username); - } - else { - getLogger().warning("Failed to download skin for player " + username); - } return Optional.ofNullable(img); }; From 02221dc640ce782671e3cf076998aaf22ee64119 Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 19:25:14 +0300 Subject: [PATCH 4/6] change spaces to tab --- pom.xml | 242 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/pom.xml b/pom.xml index 1a0a19a..8f2778e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,130 +1,130 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.technicjelle - BlueMapCustomSkinProvider - 1.6 - jar + com.technicjelle + BlueMapCustomSkinProvider + 1.6 + jar - BlueMapCustomSkinProvider + BlueMapCustomSkinProvider - A paper plugin to use a custom skin server for BlueMap - - 16 - UTF-8 - - https://github.com/TechnicJelle/BlueMapCustomSkinProvider + A paper plugin to use a custom skin server for BlueMap + + 16 + UTF-8 + + https://github.com/TechnicJelle/BlueMapCustomSkinProvider - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - ${java.version} - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - - - org.bstats - com.technicjelle.bluemapcustomskinprovider.shadow.bstats - - - - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${java.version} + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + + org.bstats + com.technicjelle.bluemapcustomskinprovider.shadow.bstats + + + + + + package + + shade + + + false + + + + + + + + src/main/resources + true + + + - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - papermc-repo - https://repo.papermc.io/repository/maven-public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - bluecolored-releases - BlueColored Repository - https://repo.bluecolored.de/releases - - + + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + papermc-repo + https://repo.papermc.io/repository/maven-public/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ + + + bluecolored-releases + BlueColored Repository + https://repo.bluecolored.de/releases + + - - - me.clip - placeholderapi - 2.11.6 - provided - - - com.technicjelle - UpdateChecker - 2.5.1 - compile - - - com.technicjelle - MCUtils - 2.0 - compile - - - com.destroystokyo.paper - paper-api - 1.13-R0.1-SNAPSHOT - provided - - - de.bluecolored.bluemap - BlueMapAPI - 2.7.2 - provided - - - org.jetbrains - annotations - 23.1.0 - compile - - - org.bstats - bstats-bukkit - 3.0.3 - compile - - + + + me.clip + placeholderapi + 2.11.6 + provided + + + com.technicjelle + UpdateChecker + 2.5.1 + compile + + + com.technicjelle + MCUtils + 2.0 + compile + + + com.destroystokyo.paper + paper-api + 1.13-R0.1-SNAPSHOT + provided + + + de.bluecolored.bluemap + BlueMapAPI + 2.7.2 + provided + + + org.jetbrains + annotations + 23.1.0 + compile + + + org.bstats + bstats-bukkit + 3.0.3 + compile + + From 19e7d783a714e16642e347a307160a1461db5939 Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 19:31:23 +0300 Subject: [PATCH 5/6] add guide in papi to config --- src/main/resources/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 8191566..51452f1 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,3 +1,5 @@ # Available placeholders: {UUID},{UUID-},{USERNAME} # {UUID-}: UUID of the player without "-" +# Supports PAPI placeholders! +# Example: %player_displayname% (don't forget to install extension in PAPI -> /papi ecloud download Player) url: "https://minotar.net/skin/{UUID}" From 4e06334cc3391b057ea4f6b30edc4138f2e0142a Mon Sep 17 00:00:00 2001 From: "TheDiVaZo (server)" Date: Sun, 10 Nov 2024 19:35:59 +0300 Subject: [PATCH 6/6] replace it tabs --- .../bluemapcustomskinprovider/PAPIUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java b/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java index 1a2b68d..e2ff170 100644 --- a/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java +++ b/src/main/java/com/technicjelle/bluemapcustomskinprovider/PAPIUtil.java @@ -5,12 +5,12 @@ import org.bukkit.entity.Player; public final class PAPIUtil { - private PAPIUtil() {} + private PAPIUtil() {} - public static String processPAPI(Player player, String str) { - if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null && player != null) { - return PlaceholderAPI.setPlaceholders(player, str); - } - else return str; - } + public static String processPAPI(Player player, String str) { + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null && player != null) { + return PlaceholderAPI.setPlaceholders(player, str); + } + else return str; + } }