502647092/YumCore
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/YumCore.git synced 2024-12-26 07:18:52 +00:00
Code Issues Releases Activity

feat: 更新Replace添加提示

Browse Source
This commit is contained in:
502647092 2018-03-05 18:52:08 +08:00
parent e74c8275e2
commit f692881ec5
2 changed files with 92 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>pw.yumc</groupId>
<artifactId>YumCore</artifactId>
<version>1.8.7</version>
<version>1.8.8</version>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>

26
src/main/java/pw/yumc/YumCore/text/Replace.java
View File

@ -13,9 +13,13 @@ import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import me.clip.placeholderapi.PlaceholderAPI;
import pw.yumc.YumCore.bukkit.Log;
import pw.yumc.YumCore.bukkit.P;
import pw.yumc.YumCore.bukkit.compatible.C;
/**
* @author MiaoWoo
*/
public class Replace {
private static boolean papi = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
@ -32,16 +36,24 @@ public class Replace {
}
private static String p(final Player p, final String text) {
return PlaceholderAPI.setPlaceholders(p, s(p, text));
String result = s(p, text);
try {
return PlaceholderAPI.setPlaceholders(p, result);
} catch (Exception ex) {
Log.console("§4[Replace] §cPAPI变量 §a%s 替换时发生错误 §4%s: %s §6请检查 §bPlaceholderAPI §6扩展配置!", text, ex.getClass().getName(), ex.getMessage());
ex.printStackTrace();
return result;
}
}
private static String s(final Player p, final String text) {
return SimpleRelpace.$(p, text);
return SimpleReplace.$(p, text);
}
static class SimpleRelpace {
static class SimpleReplace {
private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
private static final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private static final ThreadLocal<SimpleDateFormat> DF = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
public static String $(final Player player, String text) {
final Matcher m = PLACEHOLDER_PATTERN.matcher(text);
@ -63,6 +75,7 @@ public class Replace {
case "time":
value = time(player, ka[1]);
break;
default:
}
if (value != null) {
text = text.replace("%" + format + "%", Matcher.quoteReplacement(value));
@ -140,7 +153,7 @@ public class Replace {
final String time = key.split("_")[1];
String value = "解析错误";
try {
final long left = df.parse(time).getTime() - System.currentTimeMillis();
final long left = DF.get().parse(time).getTime() - System.currentTimeMillis();
value = String.valueOf(left / 1000);
} catch (final ParseException ignored) {
}
@ -148,7 +161,7 @@ public class Replace {
}
switch (key) {
case "now":
return df.format(date);
return DF.get().format(date);
case "year":
return String.valueOf(date.getYear() + 1900);
case "month":
@ -161,6 +174,7 @@ public class Replace {
return String.valueOf(date.getMinutes());
case "second":
return String.valueOf(date.getSeconds());
default:
}
return String.format("%%time_%s%%", key);
}