502647092
/
YumCore
mirror of https://e.coding.net/circlecloud/YumCore.git
1
0
Fork 0
Code Issues Releases Activity

feat: 兼容新的刷怪蛋 调整一些小问题 

Signed-off-by: MiaoWoo <admin@yumc.pw>
merge/16/MERGE
MiaoWoo 2019-09-30 17:44:16 +08:00
parent 558157da8a
commit 857a903336
4 changed files with 609 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/pw/yumc/YumCore/bukkit/P.java
View File

@ -46,6 +46,7 @@ public class P {
}
} catch (Exception e) {
Log.d("P 类初始化失败 %s:%s", e.getClass().getName(), e.getMessage());
Log.d(e);
}
}

37
src/main/java/pw/yumc/YumCore/commands/CommandParse.java
View File

@ -104,12 +104,14 @@ public class CommandParse {
for (int i = 0; i < parses.size(); i++) {
try {
Parse p = parses.get(i);
String param = i < args.length ? args[i] : p.getDefault();
String param = i < args.length ? args[i] : null;
param = param == null ? p.getDefault(sender) : param;
// 参数大于解析器 并且为最后一个参数
if (i + 1 == parses.size() && args.length >= parses.size()) {
param = join(Arrays.copyOfRange(args, i, args.length), " ");
}
pobjs.add(param == null ? null : p.parse(sender, param));
// 尝试让解析器解析Null参数
try { pobjs.add(p.parse(sender, param)); } catch (NullPointerException npe) { pobjs.add(null); }
} catch (Exception e) {
Log.fd(e);
throw new ParseException(String.format("第 %s 个参数 %s", isMain ? 1 : 2 + i, e.getMessage()));
@ -125,7 +127,7 @@ public class CommandParse {
protected int max = Integer.MAX_VALUE;
protected int min = 0;
public String getDefault() {
public String getDefault(CommandSender sender) {
return def;
}
@ -178,20 +180,20 @@ public class CommandParse {
}
public static class ValueOfParse extends Parse<Object> {
private Class etype;
private Enum[] elist;
private Class eType;
private Enum[] eList;
private Method method;
private Method checker;
public ValueOfParse(Class etype, Method method) {
this.etype = etype;
public ValueOfParse(Class eType, Method method) {
this.eType = eType;
try {
checker = etype.getDeclaredMethod("doubleValue");
checker = eType.getDeclaredMethod("doubleValue");
} catch (NoSuchMethodException ignored) {
}
this.method = method;
if (etype.isEnum()) {
this.elist = ((Class<Enum>) etype).getEnumConstants();
if (eType.isEnum()) {
this.eList = ((Class<Enum>) eType).getEnumConstants();
}
}
@ -207,10 +209,10 @@ public class CommandParse {
}
return result;
} catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException ex) {
if (etype.isEnum() && elist.length < 21) {
return throwException("%s 不是 %s 有效值为 %s", arg, etype.getSimpleName(), Arrays.toString(elist));
if (eType.isEnum() && eList.length < 21) {
return throwException("%s 不是 %s 有效值为 %s", arg, eType.getSimpleName(), Arrays.toString(eList));
} else {
return throwException("%s 不是一个有效的 %s", arg, etype.getSimpleName());
return throwException("%s 不是一个有效的 %s", arg, eType.getSimpleName());
}
}
}
@ -226,21 +228,28 @@ public class CommandParse {
}
public static class PlayerParse extends Parse<Player> {
boolean sender = false;
boolean check = false;
@Override
public Player parse(CommandSender sender, String arg) {
Player p = Bukkit.getPlayerExact(arg);
if (check && p == null) { return throwException("玩家 %s 不存在或不在线!", arg); }
if (this.check && p == null) { return throwException("玩家 %s 不存在或不在线!", arg); }
return p;
}
@Override
public Parse<Player> handleAttrs() {
super.handleAttrs();
sender = attrs.containsKey("sender");
check = attrs.containsKey("check");
return this;
}
@Override
public String getDefault(CommandSender sender) {
return this.sender && sender instanceof Player ? sender.getName() : super.getDefault(sender);
}
}
public static class StringParse extends Parse<String> {

11
src/main/java/pw/yumc/YumCore/commands/CommandSub.java
View File

@ -70,6 +70,9 @@ public class CommandSub implements TabExecutor {
*/
private List<String> cmdNameCache = new ArrayList<>();
public CommandSub() {
}
/**
* 命令管理器
*
@ -178,9 +181,9 @@ public class CommandSub implements TabExecutor {
if (defCmd != null) { return defCmd.execute(sender, label, args); }
return help.send(sender, label, args);
}
String subcmd = args[0].toLowerCase();
if (subcmd.equalsIgnoreCase("help")) { return help.send(sender, label, args); }
CommandInfo cmd = getByCache(subcmd);
String subCmd = args[0].toLowerCase();
if ("help".equalsIgnoreCase(subCmd)) { return help.send(sender, label, args); }
CommandInfo cmd = getByCache(subCmd);
String[] subargs = args;
if (cmd.equals(CommandInfo.Unknow) && defCmd != null) {
cmd = defCmd;
@ -238,7 +241,7 @@ public class CommandSub implements TabExecutor {
CommandInfo ci = CommandInfo.parse(method, clazz);
if (ci != null) {
Class[] params = method.getParameterTypes();
Log.d("注册子命令: %s 参数类型: %s", ci.getName(), Log.getSimpleNames((Object[]) params));
Log.d("注册子命令: %s 参数类型: %s", ci.getName(), Log.getSimpleNames(params));
try {
Class<? extends CommandSender> sender = params[0];
// 用于消除unuse警告

10
src/main/java/pw/yumc/YumCore/global/L10N.java
View File

@ -5,6 +5,7 @@ import java.util.Map;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SpawnEggMeta;
import org.bukkit.material.SpawnEgg;
import pw.yumc.YumCore.bukkit.Log;
@ -14,8 +15,8 @@ import pw.yumc.YumCore.config.ext.YumConfig;
/**
* 本地化工具类
*
* @since 2015年12月14日 下午1:33:52
* @author 喵♂呜
* @since 2015年12月14日 下午1:33:52
*/
public class L10N {
private static String CONFIG_NAME = "Item_zh_CN.yml";
@ -39,7 +40,8 @@ public class L10N {
* @return 物品名称
*/
public static String getFullName(ItemStack i) {
return getItemName(getItemType(i)) + (i.hasItemMeta() && i.getItemMeta().hasDisplayName() ? "§r(" + i.getItemMeta().getDisplayName() + "§r)" : "");
return getItemName(getItemType(i)) + (i.hasItemMeta() && i.getItemMeta().hasDisplayName() ? "§r(" + i.getItemMeta()
.getDisplayName() + "§r)" : "");
}
/**
@ -103,7 +105,11 @@ public class L10N {
String name = i.getType().name();
String dura = "";
if (i.getType() == Material.MONSTER_EGG) {
try {
name = ((SpawnEgg) i.getData()).getSpawnedType().name();
} catch (NullPointerException npe) {
name = ((SpawnEggMeta) i.getItemMeta()).getSpawnedType().name();
}
} else {
int dur = i.getDurability();
dura = (i.getMaxStackSize() != 1 && dur != 0) ? Integer.toString(dur) : "";