From fc76c147cc7540fd92d18af273965472dc1d61fb Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Thu, 12 May 2022 22:10:05 +0200 Subject: [PATCH] better description when editing enter/leave text --- Changelog.md | 3 ++ .../flemmli97/flan/config/LangManager.java | 9 +++--- .../flemmli97/flan/gui/ClaimTextHandler.java | 30 ++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5a2f4fa..439ba32 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,9 @@ Flan 1.7.7 ================ - Prevent moss/grassblock/nylium bonemealing if too close to a claim without permission +- Make subclaims inherit some data of the parent claim upon creation. + E.g. player groups or set group permissions +- Better description when editing enter/leave text Flan 1.7.6 ================ 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 d684d59..afc1fbb 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 @@ -142,10 +142,11 @@ public class LangManager { this.defaultTranslation.put("screenPotions", "Claim Potions"); this.defaultTranslation.put("screenTitleEditor", "Claim messages"); this.defaultTranslation.put("screenTitleEditorSub", "Subclaim messages"); - this.defaultTranslation.put("screenEnterText", "Edit title text on enter. (Right-Click to use JSON text. See MC Wiki for that)"); - this.defaultTranslation.put("screenEnterSubText", "Edit subtitle text on enter. (Right-Click to use JSON text. See MC Wiki for that)"); - this.defaultTranslation.put("screenLeaveText", "Edit title text on leave. (Right-Click to use JSON text. See MC Wiki for that)"); - this.defaultTranslation.put("screenLeaveSubText", "Edit subtitle text on leave. (Right-Click to use JSON text. See MC Wiki for that)"); + this.defaultTranslation.put("screenTextJson", "Right-Click to use JSON text. See MC Wiki for that."); + this.defaultTranslation.put("screenEnterText", "Edit title text on enter."); + this.defaultTranslation.put("screenEnterSubText", "Edit subtitle text on enter."); + this.defaultTranslation.put("screenLeaveText", "Edit title text on leave."); + this.defaultTranslation.put("screenLeaveSubText", "Edit subtitle text on leave."); this.defaultTranslation.put("screenDelete", "Use \"$empty\" to delete the message"); this.defaultTranslation.put("chatClaimTextEdit", "[Click for command]"); diff --git a/common/src/main/java/io/github/flemmli97/flan/gui/ClaimTextHandler.java b/common/src/main/java/io/github/flemmli97/flan/gui/ClaimTextHandler.java index 3be2134..e01229d 100644 --- a/common/src/main/java/io/github/flemmli97/flan/gui/ClaimTextHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/gui/ClaimTextHandler.java @@ -21,6 +21,8 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import java.util.ArrayList; +import java.util.List; import java.util.function.Consumer; public class ClaimTextHandler extends ServerOnlyScreenHandler { @@ -59,33 +61,45 @@ public class ClaimTextHandler extends ServerOnlyScreenHandler { case 2 -> { ItemStack stack = new ItemStack(Items.OAK_SIGN); stack.setHoverName(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenEnterText"), ChatFormatting.GOLD)); - ServerScreenHelper.addLore(stack, ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); + List lore = new ArrayList<>(); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenTextJson"), ChatFormatting.GOLD)); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); if (claim.enterTitle != null) - ServerScreenHelper.addLore(stack, claim.enterTitle); + lore.add(claim.enterTitle); + ServerScreenHelper.addLore(stack, lore); inv.updateStack(i, stack); } case 3 -> { ItemStack stack2 = new ItemStack(Items.OAK_SIGN); stack2.setHoverName(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenEnterSubText"), ChatFormatting.GOLD)); - ServerScreenHelper.addLore(stack2, ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); + List lore = new ArrayList<>(); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenTextJson"), ChatFormatting.GOLD)); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); if (claim.enterSubtitle != null) - ServerScreenHelper.addLore(stack2, claim.enterSubtitle); + lore.add(claim.enterSubtitle); + ServerScreenHelper.addLore(stack2, lore); inv.updateStack(i, stack2); } case 4 -> { ItemStack stack3 = new ItemStack(Items.OAK_SIGN); stack3.setHoverName(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenLeaveText"), ChatFormatting.GOLD)); - ServerScreenHelper.addLore(stack3, ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); + List lore = new ArrayList<>(); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenTextJson"), ChatFormatting.GOLD)); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); if (claim.leaveTitle != null) - ServerScreenHelper.addLore(stack3, claim.leaveTitle); + lore.add(claim.leaveTitle); + ServerScreenHelper.addLore(stack3, lore); inv.updateStack(i, stack3); } case 5 -> { ItemStack stack4 = new ItemStack(Items.OAK_SIGN); stack4.setHoverName(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenLeaveSubText"), ChatFormatting.GOLD)); - ServerScreenHelper.addLore(stack4, ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); + List lore = new ArrayList<>(); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenTextJson"), ChatFormatting.GOLD)); + lore.add(ServerScreenHelper.coloredGuiText(ConfigHandler.langManager.get("screenDelete"), ChatFormatting.DARK_RED)); if (claim.leaveSubtitle != null) - ServerScreenHelper.addLore(stack4, claim.leaveSubtitle); + lore.add(claim.leaveSubtitle); + ServerScreenHelper.addLore(stack4, lore); inv.updateStack(i, stack4); } default -> inv.updateStack(i, ServerScreenHelper.emptyFiller());