diff --git a/advancedregionmarket/src/main/java/net/alex9849/arm/Messages.java b/advancedregionmarket/src/main/java/net/alex9849/arm/Messages.java index ac6927bc..46409c4c 100644 --- a/advancedregionmarket/src/main/java/net/alex9849/arm/Messages.java +++ b/advancedregionmarket/src/main/java/net/alex9849/arm/Messages.java @@ -1045,12 +1045,12 @@ public static MessageLocale byCode(String code) { @Message(name = "GUIRemoveMemberButtonLore", message = {"Click to remove the selected member", "from your region"}) public static List GUI_REMOVE_MEMBER_BUTTON_LORE; - @Message(name = "GUIResetRegionButtonLore", version = 6,message = {"Click to reset your region", + @Message(name = "GUIResetRegionButtonLore", version = 8, message = {"Click to reset your region", "&4WARNING: &cThis can not be undone! Your region", "&cwill be resetted and everything on it will", "&cbe deleted!", "", - "&cYou can only reset you region once every %userrestorecooldown%", + "&cYou can only reset you region once every %remaininguserrestorecooldown-countdown-short%", "&2You and all members keep their rights on the region"}) public static List GUI_RESET_REGION_BUTTON_LORE; @Message(name = "TakeOverItemLore", message = {"&aYou are a member of this region.", diff --git a/advancedregionmarket/src/main/java/net/alex9849/arm/regions/RentRegion.java b/advancedregionmarket/src/main/java/net/alex9849/arm/regions/RentRegion.java index 8d99c70c..018b58a8 100644 --- a/advancedregionmarket/src/main/java/net/alex9849/arm/regions/RentRegion.java +++ b/advancedregionmarket/src/main/java/net/alex9849/arm/regions/RentRegion.java @@ -216,10 +216,10 @@ protected HashMap> getVariableReplacements() { return TimeUtil.timeInMsToString(this.getCurrentExtendTime(), false, false); }); variableReplacements.put("%remainingtime-next-extend-countdown-writtenout%", () -> { - return TimeUtil.timeInMsToString(this.getPayedTill() + this.getCurrentExtendTime(), true, false); + return TimeUtil.getCountdown(this.getPayedTill() + this.getCurrentExtendTime(), true, false, false, Messages.REGION_INFO_EXPIRED); }); variableReplacements.put("%remainingtime-next-extend-countdown-short%", () -> { - return TimeUtil.timeInMsToString(this.getPayedTill() + this.getCurrentExtendTime(), false, false); + return TimeUtil.getCountdown(this.getPayedTill() + this.getCurrentExtendTime(), false, false, false, Messages.REGION_INFO_EXPIRED); }); variableReplacements.put("%price-current%", () -> { return Price.formatPrice(this.getCurrentExtendPrice());