mirror of
https://github.com/CarmJos/ScriptItems
synced 2024-09-19 21:35:50 +00:00
完善消息提示
This commit is contained in:
parent
8aeacd8d45
commit
8dcef9431c
@ -63,8 +63,7 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack after = settings.applyItem(item);
|
player.getInventory().setItemInMainHand(settings.applyItem(item.clone()));
|
||||||
player.getInventory().setItemInMainHand(after);
|
|
||||||
PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName());
|
PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName());
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -109,10 +108,10 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter {
|
|||||||
|
|
||||||
HashMap<Integer, ItemStack> remain = player.getInventory().addItem(item);
|
HashMap<Integer, ItemStack> remain = player.getInventory().addItem(item);
|
||||||
if (remain.isEmpty()) {
|
if (remain.isEmpty()) {
|
||||||
PluginMessages.GIVEN_ALL.send(sender, player.getName(), item.getAmount(), settings.getName());
|
PluginMessages.GIVEN_ALL.send(sender, player.getName(), amount, settings.getName());
|
||||||
} else {
|
} else {
|
||||||
int remainAmount = remain.values().stream().mapToInt(ItemStack::getAmount).sum();
|
int remainAmount = remain.values().stream().mapToInt(ItemStack::getAmount).sum();
|
||||||
PluginMessages.GIVEN_SOME.send(sender, player.getName(), item.getAmount() - remainAmount, settings.getName(), remainAmount);
|
PluginMessages.GIVEN_SOME.send(sender, player.getName(), amount - remainAmount, settings.getName(), remainAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -18,7 +18,7 @@ public class PluginMessages extends MessagesRoot {
|
|||||||
|
|
||||||
|
|
||||||
public final static EasyMessageList COOLDOWN = EasyMessageList.builder()
|
public final static EasyMessageList COOLDOWN = EasyMessageList.builder()
|
||||||
.contents("&f您需要等待 &c%(time)秒 &f才可再次使用该物品。")
|
.contents("&f您需要等待 &a%(time)秒 &f才可再次使用该物品。")
|
||||||
.params("time").build();
|
.params("time").build();
|
||||||
|
|
||||||
public final static EasyMessageList ONLY_PLAYER = EasyMessageList.builder()
|
public final static EasyMessageList ONLY_PLAYER = EasyMessageList.builder()
|
||||||
@ -44,11 +44,11 @@ public class PluginMessages extends MessagesRoot {
|
|||||||
.build();
|
.build();
|
||||||
|
|
||||||
public final static EasyMessageList GIVEN_ALL = EasyMessageList.builder()
|
public final static EasyMessageList GIVEN_ALL = EasyMessageList.builder()
|
||||||
.contents("&f您成功给予 &a%(player) &f了 &a%(amount) &f个 &a%(name) &f。")
|
.contents("&f您成功给予 &2%(player) &f了 &a%(amount) &f个 &a%(name) &f。")
|
||||||
.params("player", "amount", "name").build();
|
.params("player", "amount", "name").build();
|
||||||
|
|
||||||
public final static EasyMessageList GIVEN_SOME = EasyMessageList.builder().contents(
|
public final static EasyMessageList GIVEN_SOME = EasyMessageList.builder().contents(
|
||||||
"&f您成功给予 &a%(player) &f了 &a%(amount) &f个 &a%(name) &f。",
|
"&f您成功给予 &2%(player) &f了 &a%(amount) &f个 &a%(name) &f。",
|
||||||
"&f但由于目标玩家背包已满,仍有 &a%(remain) &f个 &a%(name) &f未成功放入背包。"
|
"&f但由于目标玩家背包已满,仍有 &a%(remain) &f个 &a%(name) &f未成功放入背包。"
|
||||||
).params("player", "amount", "name", "remain").build();
|
).params("player", "amount", "name", "remain").build();
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ public class PluginMessages extends MessagesRoot {
|
|||||||
.build();
|
.build();
|
||||||
|
|
||||||
public final static EasyMessageList NOT_STARTED = EasyMessageList.builder()
|
public final static EasyMessageList NOT_STARTED = EasyMessageList.builder()
|
||||||
.contents("&f该物品目前还到可使用的时间,请在 &c%(time) &f后使用~")
|
.contents("&f该物品目前还到可使用的时间,请在 &a%(time) &f后使用~")
|
||||||
.params("time")
|
.params("time")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user