outsource/ScriptItems
outsource/ScriptItems
1
Fork 0
mirror of https://github.com/CarmJos/ScriptItems synced 2024-09-19 21:35:50 +00:00
Code Releases Activity

完善消息提示

Browse Source
This commit is contained in:
Carm Jos 2022-03-13 18:26:14 +08:00
parent 8aeacd8d45
commit 8dcef9431c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java
View File

@ -63,8 +63,7 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter {
return true;
}
ItemStack after = settings.applyItem(item);
player.getInventory().setItemInMainHand(after);
player.getInventory().setItemInMainHand(settings.applyItem(item.clone()));
PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName());
return true;
@ -109,10 +108,10 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter {
HashMap<Integer, ItemStack> remain = player.getInventory().addItem(item);
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 {
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;

8
src/main/java/cc/carm/plugin/scriptitems/configuration/PluginMessages.java
View File

@ -18,7 +18,7 @@ public class PluginMessages extends MessagesRoot {
public final static EasyMessageList COOLDOWN = EasyMessageList.builder()
.contents("&f您需要等待 &c%(time)秒 &f才可再次使用该物品。")
.contents("&f您需要等待 &a%(time)秒 &f才可再次使用该物品。")
.params("time").build();
public final static EasyMessageList ONLY_PLAYER = EasyMessageList.builder()
@ -44,11 +44,11 @@ public class PluginMessages extends MessagesRoot {
.build();
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();
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未成功放入背包。"
).params("player", "amount", "name", "remain").build();
@ -64,7 +64,7 @@ public class PluginMessages extends MessagesRoot {
.build();
public final static EasyMessageList NOT_STARTED = EasyMessageList.builder()
.contents("&f该物品目前还到可使用的时间，请在 &c%(time) &f后使用~")
.contents("&f该物品目前还到可使用的时间，请在 &a%(time) &f后使用~")
.params("time")
.build();