From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 3 Nov 2020 01:25:06 -0600 Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index e2f57af54380c7afa5c6ac00c8aba74e838465c4..c84cb931a78390fd485b95e8c9b9904de920f254 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1273,13 +1273,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser itemstack1.setTag(nbttagcompound.copy()); } + // Purpur start + boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit") || getCraftPlayer().hasPermission("purpur.book.color.sign"); itemstack1.addTagElement("author", StringTag.valueOf(this.player.getName().getString())); if (this.player.isTextFilteringEnabled()) { - itemstack1.addTagElement("title", StringTag.valueOf((String) title.filteredOrElse(""))); + itemstack1.addTagElement("title", StringTag.valueOf(color(title.filteredOrElse(""), hasPerm))); } else { - itemstack1.addTagElement("filtered_title", StringTag.valueOf((String) title.filteredOrElse(""))); - itemstack1.addTagElement("title", StringTag.valueOf((String) title.raw())); + itemstack1.addTagElement("filtered_title", StringTag.valueOf(color(title.filteredOrElse(""), hasPerm))); + itemstack1.addTagElement("title", StringTag.valueOf(color(title.raw(), hasPerm))); } + // Purpur end this.updateBookPages(pages, (s) -> { return Component.Serializer.toJson(Component.literal(s)); @@ -1291,10 +1294,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser public void updateBookPages(List> list, UnaryOperator unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit ListTag nbttaglist = new ListTag(); + // Purpur start + boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit"); if (this.player.isTextFilteringEnabled()) { - Stream stream = list.stream().map((filteredtext) -> { // CraftBukkit - decompile error - return StringTag.valueOf((String) unaryoperator.apply((String) filteredtext.filteredOrElse(""))); + Stream stream = list.stream().map(s -> color(s.filteredOrElse(""), hasPerm, false)).map((s) -> { // CraftBukkit - decompile error + return StringTag.valueOf((String) unaryoperator.apply(s)); }); + // Purpur end Objects.requireNonNull(nbttaglist); stream.forEach(nbttaglist::add); @@ -1304,11 +1310,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser for (int j = list.size(); i < j; ++i) { FilteredText filteredtext = (FilteredText) list.get(i); - String s = (String) filteredtext.raw(); + String s = color(filteredtext.raw(), hasPerm, false); // Purpur nbttaglist.add(StringTag.valueOf((String) unaryoperator.apply(s))); if (filteredtext.isFiltered()) { - nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply((String) filteredtext.filteredOrElse(""))); + nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply((String) color(filteredtext.filteredOrElse(""), hasPerm, false))); // Purpur } } @@ -1321,6 +1327,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent) } + // Purpur start + private String color(String str, boolean hasPerm) { + return color(str, hasPerm, true); + } + + private String color(String str, boolean hasPerm, boolean parseHex) { + return hasPerm ? org.bukkit.ChatColor.color(str, parseHex) : str; + } + // Purpur end + @Override public void handleEntityTagQuery(ServerboundEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());