flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #192

Browse Source 
Add claim info QOL features
This commit is contained in:
Flemmli97 2022-11-26 13:49:35 +01:00 committed by GitHub
commit 10699474c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/io/github/flemmli97/flan/claim/Claim.java
View File

@ -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) {

2
common/src/main/java/io/github/flemmli97/flan/config/LangManager.java
View File

@ -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");

1
common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java
View File

@ -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) {