From b909c58adb689d461ad74c0cd533cf711dc4e27b Mon Sep 17 00:00:00 2001 From: Ste3et_C0st Date: Mon, 1 Aug 2022 10:59:33 +0200 Subject: [PATCH] Add message to LimitationInformation --- .../LimitationInforamtion.java | 17 +++++++++++++++++ .../LimitationManager/LimitationManager.java | 14 ++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationInforamtion.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationInforamtion.java index 951ba8c8..a9ab246f 100644 --- a/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationInforamtion.java +++ b/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationInforamtion.java @@ -1,5 +1,11 @@ package de.Ste3et_C0st.FurnitureLib.LimitationManager; +import org.bukkit.entity.Player; + +import de.Ste3et_C0st.FurnitureLib.Crafting.Project; +import de.Ste3et_C0st.FurnitureLib.Utilitis.LanguageManager; +import de.Ste3et_C0st.FurnitureLib.Utilitis.StringTranslator; + public class LimitationInforamtion { private final String type; @@ -32,4 +38,15 @@ public boolean isInfinite() { return max < 1; } + public void sendMessage(Player player, Project project, int amount) { + String name = isCanceld() ? ".reached" : ".info"; + String messageName = "message.limit." + type + name; + player.sendMessage(LanguageManager.getInstance().getString(messageName, + new StringTranslator("#amount#", Integer.toString(amount)), + new StringTranslator("#size#", Integer.toString(getMax())), + new StringTranslator("#project#", project.getDisplayName()), + new StringTranslator("#world#", player.getWorld().getName()) + )); + } + } diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationManager.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationManager.java index d0e62086..7c5c4ffa 100644 --- a/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationManager.java +++ b/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/LimitationManager.java @@ -138,22 +138,12 @@ public boolean canPlace(Player p, ObjectID obj) { Optional canceldLimit = informationList.stream().filter(LimitationInforamtion::isCanceld).findFirst(); if(canceldLimit.isPresent()) { LimitationInforamtion object = canceldLimit.get(); - p.sendMessage(LanguageManager.getInstance().getString("message.limit." + object.getType() + ".reached", - new StringTranslator("#amount#", Integer.toString(object.getAmount())), - new StringTranslator("#size#", Integer.toString(object.getMax())), - new StringTranslator("#project#", pro.getDisplayName()), - new StringTranslator("#world#", world.getName()) - )); + object.sendMessage(p, pro, object.getAmount()); return false; }else { LimitationInforamtion infoLimit = informationList.stream().findFirst().orElse(null); if(Objects.nonNull(infoLimit)) { - p.sendMessage(LanguageManager.getInstance().getString("message.limit." + infoLimit.getType() + ".info", - new StringTranslator("#amount#", Integer.toString(infoLimit.getAmount() + 1)), - new StringTranslator("#size#", Integer.toString(infoLimit.getMax())), - new StringTranslator("#project#", pro.getDisplayName()), - new StringTranslator("#world#", world.getName()) - )); + infoLimit.sendMessage(p, pro, infoLimit.getAmount() + 1); } } }