SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2024-11-18 00:46:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for OfflinePlayer

Browse Source
This commit is contained in:
extendedclip 2018-05-31 14:35:28 -04:00
parent cfccc69839
commit a50212e395
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/me/clip/placeholderapi/PlaceholderAPI.java
View File

@ -28,6 +28,7 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import me.clip.placeholderapi.expansion.Relational; import me.clip.placeholderapi.expansion.Relational;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -135,7 +136,7 @@ public class PlaceholderAPI {
* @param text text to set the placeholder values in * @param text text to set the placeholder values in
* @return modified list with all placeholders set to the corresponding values * @return modified list with all placeholders set to the corresponding values
*/ */
public static List<String> setBracketPlaceholders(Player p, List<String> text) { public static List<String> setBracketPlaceholders(OfflinePlayer p, List<String> text) {
return setPlaceholders(p, text, BRACKET_PLACEHOLDER_PATTERN); return setPlaceholders(p, text, BRACKET_PLACEHOLDER_PATTERN);
} }
@ -147,7 +148,7 @@ public class PlaceholderAPI {
* @param text text to parse the placeholder values in * @param text text to parse the placeholder values in
* @return modified list with all placeholders set to the corresponding values * @return modified list with all placeholders set to the corresponding values
*/ */
public static List<String> setPlaceholders(Player p, List<String> text) { public static List<String> setPlaceholders(OfflinePlayer p, List<String> text) {
return setPlaceholders(p, text, PLACEHOLDER_PATTERN); return setPlaceholders(p, text, PLACEHOLDER_PATTERN);
} }
@ -159,7 +160,7 @@ public class PlaceholderAPI {
* @param text text to parse the placeholder values in * @param text text to parse the placeholder values in
* @return modified list with all placeholders set to the corresponding values * @return modified list with all placeholders set to the corresponding values
*/ */
public static List<String> setPlaceholders(Player p, List<String> text, Pattern pattern) { public static List<String> setPlaceholders(OfflinePlayer p, List<String> text, Pattern pattern) {
if (text == null) return null; if (text == null) return null;
return text.stream().map(line -> setPlaceholders(p, line, pattern)).collect(Collectors.toList()); return text.stream().map(line -> setPlaceholders(p, line, pattern)).collect(Collectors.toList());
} }
@ -172,7 +173,7 @@ public class PlaceholderAPI {
* @param text text to parse the placeholder values to * @param text text to parse the placeholder values to
* @return modified text with all placeholders set to the corresponding values * @return modified text with all placeholders set to the corresponding values
*/ */
public static String setBracketPlaceholders(Player player, String text) { public static String setBracketPlaceholders(OfflinePlayer player, String text) {
return setPlaceholders(player, text, BRACKET_PLACEHOLDER_PATTERN); return setPlaceholders(player, text, BRACKET_PLACEHOLDER_PATTERN);
} }
@ -184,7 +185,7 @@ public class PlaceholderAPI {
* @param text text to parse the placeholder values to * @param text text to parse the placeholder values to
* @return text with all placeholders set to the corresponding values * @return text with all placeholders set to the corresponding values
*/ */
public static String setPlaceholders(Player player, String text) { public static String setPlaceholders(OfflinePlayer player, String text) {
return setPlaceholders(player, text, PLACEHOLDER_PATTERN); return setPlaceholders(player, text, PLACEHOLDER_PATTERN);
} }
@ -197,7 +198,7 @@ public class PlaceholderAPI {
* @param placeholderPattern the pattern to match placeholders to. Capture group 1 must contain an underscore separating the identifier from the params * @param placeholderPattern the pattern to match placeholders to. Capture group 1 must contain an underscore separating the identifier from the params
* @return text with all placeholders set to the corresponding values * @return text with all placeholders set to the corresponding values
*/ */
public static String setPlaceholders(Player player, String text, Pattern placeholderPattern) { public static String setPlaceholders(OfflinePlayer player, String text, Pattern placeholderPattern) {
if (text == null) return null; if (text == null) return null;
if (placeholders.isEmpty()) return color(text); if (placeholders.isEmpty()) return color(text);
Matcher m = placeholderPattern.matcher(text); Matcher m = placeholderPattern.matcher(text);

28
src/main/java/me/clip/placeholderapi/PlaceholderHook.java
View File

@ -20,15 +20,29 @@
*/ */
package me.clip.placeholderapi; package me.clip.placeholderapi;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public abstract class PlaceholderHook { public abstract class PlaceholderHook {
/** /**
* called when a placeholder is requested from this PlaceholderHook * called when a placeholder is requested from this hook
* @param p Player requesting the placeholder value for, null if not needed for a player * @param p {@link OfflinePlayer} to request the placeholder value for, null if not needed for a player
* @param params String passed for the placeholder hook to determine what value to return * @param params String passed to the hook to determine what value to return
* @return value for the requested player and params * @return value for the requested player and params
*/ */
public abstract String onPlaceholderRequest(Player p, String params); public String onPlaceholderRequest(OfflinePlayer p, String params) {
if (p != null && p.isOnline()) {
return onPlaceholderRequest((Player) p, params);
}
return onPlaceholderRequest(null, params);
}
/**
* @deprecated As of versions greater than 2.8.7, use {@link #onPlaceholderRequest(OfflinePlayer p, String params)}
*/
@Deprecated
public String onPlaceholderRequest(Player p, String params) {
return null;
}
} }