From e10fc55f913a68a5aa159993689862a1680c1225 Mon Sep 17 00:00:00 2001
From: Jarva <4622609+Jarva@users.noreply.github.com>
Date: Sat, 23 Jul 2022 23:36:38 +0100
Subject: [PATCH] feat: add block usage to claim info

---
 .../src/main/java/io/github/flemmli97/flan/claim/Claim.java   | 4 ++--
 .../java/io/github/flemmli97/flan/config/LangManager.java     | 2 +-
 .../java/io/github/flemmli97/flan/player/PlayerClaimData.java | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java b/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java
index fe10c4d..3fad601 100644
--- a/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java
+++ b/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java
@@ -782,8 +782,8 @@ public class Claim implements IPermissionContainer {
 
     public String formattedClaim() {
         if (this.claimName.isEmpty())
-            return String.format("[x=%d,z=%d] - [x=%d,z=%d]", this.minX, this.minZ, this.maxX, this.maxZ);
-        return String.format("%s:[x=%d,z=%d] - [x=%d,z=%d]", this.claimName, this.minX, this.minZ, this.maxX, this.maxZ);
+            return String.format("[x=%d,z=%d] - [x=%d,z=%d] = %d blocks", this.minX, this.minZ, this.maxX, this.maxZ, this.getPlane());
+        return String.format("%s:[x=%d,z=%d] - [x=%d,z=%d] = %d blocks", this.claimName, this.minX, this.minZ, this.maxX, this.maxZ, this.getPlane());
     }
 
     public List<Component> infoString(ServerPlayer player, InfoType infoType) {
diff --git a/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java b/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java
index 0ee53dc..330ca9e 100644
--- a/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java
+++ b/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java
@@ -39,7 +39,7 @@ public class LangManager {
         this.defaultTranslation.put("noClaim", "There is no claim here.");
         this.defaultTranslation.put("inspectBlockOwner", "This is %1$s's claim");
         this.defaultTranslation.put("inspectNoClaim", "Nobody owns this block");
-        this.defaultTranslation.put("claimBlocksFormat", "Claim Blocks: %1$d + (Bonus) %2$d); Used: %3$d; Remaining %4$d");
+        this.defaultTranslation.put("claimBlocksFormat", "Claim Blocks: %1$d + (Bonus) %2$d); Used: %3$d; Remaining: %4$d");
         this.defaultTranslation.put("listClaims", "Listing all claims:");
         this.defaultTranslation.put("listAdminClaims", "Listing all admin-claims in %1$s:");
         this.defaultTranslation.put("onlyOnePlayer", "Only one player can be used as argument");
diff --git a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java
index defd4b5..6dcae49 100644
--- a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java
+++ b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java
@@ -291,6 +291,7 @@ public class PlayerClaimData implements IPlayerData {
             this.claimBlockMessage = true;
             this.player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("claimBlocksFormat"),
                     this.getClaimBlocks(), this.getAdditionalClaims(), this.usedClaimBlocks(), this.remainingClaimBlocks()), ChatFormatting.GOLD), false);
+            this.addDisplayClaim(currentClaim, EnumDisplayType.MAIN, player.blockPosition().getY());
         }
         this.actionCooldown--;
         if (--this.trappedTick >= 0) {