From 14906a1666907df1c3a53da2e3547e25d8f1f92f Mon Sep 17 00:00:00 2001 From: jmp Date: Sun, 21 Feb 2021 18:58:33 -0800 Subject: [PATCH] Allow for removing italics from items renamed in the anvil by starting the text with '&r' Requires the 'purpur.anvil.color' and 'purpur.anvil.remove_italics' permissions --- patches/server/0097-Allow-anvil-colors.patch | 32 ++++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/patches/server/0097-Allow-anvil-colors.patch b/patches/server/0097-Allow-anvil-colors.patch index 475f5ac5c..fac0bee70 100644 --- a/patches/server/0097-Allow-anvil-colors.patch +++ b/patches/server/0097-Allow-anvil-colors.patch @@ -5,24 +5,36 @@ Subject: [PATCH] Allow anvil colors diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 4aa6b035a6a8ea39401c6566cd286de39f60e942..bbe66247a2f1e07e58dc8039a8210492606343e8 100644 +index 4aa6b035a6a8ea39401c6566cd286de39f60e942..e6c59ca0147202daa37f7c6aa5da25b36df35ee8 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java -@@ -2,6 +2,7 @@ package net.minecraft.server; +@@ -10,6 +10,14 @@ import org.apache.logging.log4j.Logger; + import org.bukkit.craftbukkit.inventory.CraftInventoryView; + // CraftBukkit end - import java.util.Iterator; - import java.util.Map; -+import io.papermc.paper.adventure.PaperAdventure; // Purpur - import org.apache.commons.lang3.StringUtils; - import org.apache.logging.log4j.LogManager; - import org.apache.logging.log4j.Logger; -@@ -251,6 +252,12 @@ public class ContainerAnvil extends ContainerAnvilAbstract { ++// Purpur start ++import io.papermc.paper.adventure.PaperAdventure; ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; ++ ++import static net.kyori.adventure.text.format.TextDecoration.ITALIC; ++// Purpur end ++ + public class ContainerAnvil extends ContainerAnvilAbstract { + + private static final Logger LOGGER = LogManager.getLogger(); +@@ -251,6 +259,17 @@ public class ContainerAnvil extends ContainerAnvilAbstract { } else if (!this.renameText.equals(itemstack.getName().getString())) { b1 = 1; i += b1; + // Purpur start + if (player != null && player.world.purpurConfig.anvilAllowColors && player.getBukkitEntity().hasPermission("purpur.anvil.color")) { -+ final net.kyori.adventure.text.Component renameTextComponent = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().deserialize(renameText); ++ final Component renameTextComponent; ++ if (renameText.startsWith("&r") && player.getBukkitEntity().hasPermission("purpur.anvil.remove_italics")) { ++ renameTextComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(renameText.substring(2)).decoration(ITALIC, false); ++ } else { ++ renameTextComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(renameText); ++ } + itemstack1.a(PaperAdventure.asVanilla(renameTextComponent)); + } else + // Purpur end