Purpur/patches/server/0238-Signs-allow-color-codes.patch

87 lines
5.6 KiB
Diff
Raw Normal View History

2021-06-16 21:27:25 +08:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 40dc37c7acabc8eb601035d5a61cf09ef0c96ccd..4abac5e3ba5dcf27248bda31d95c85bb5e23c19d 100644
2021-06-16 21:27:25 +08:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1501,6 +1501,7 @@ public class ServerPlayer extends Player {
2021-06-16 21:27:25 +08:00
@Override
public void openTextEdit(SignBlockEntity sign) {
+ if (level.purpurConfig.signAllowColors) this.connection.send(sign.getTranslatedUpdatePacket(textFilteringEnabled)); // Purpur
sign.setAllowedPlayerEditor(this.getUUID());
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index bb491a77e2a7eb137f196747e09130e905abfb84..597ea30c360a0cc44ef83cfff118d477fa3d0b0a 100644
2021-06-16 21:27:25 +08:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3654,11 +3654,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
2022-06-09 00:14:02 +08:00
for (int i = 0; i < signText.size(); ++i) {
2022-07-28 12:53:11 +08:00
FilteredText filteredtext = (FilteredText) signText.get(i);
- if (this.player.isTextFilteringEnabled()) {
2022-07-28 12:53:11 +08:00
- lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(filteredtext.filteredOrEmpty()))); // Paper - adventure
2022-06-09 00:14:02 +08:00
+ // Purpur start
2022-07-28 12:53:11 +08:00
+ String line = SharedConstants.filterText(this.player.isTextFilteringEnabled() ? filteredtext.filteredOrEmpty() : filteredtext.raw());
+ if (worldserver.purpurConfig.signAllowColors) {
+ if (player.hasPermission("purpur.sign.color")) line = line.replaceAll("(?i)&([0-9a-fr])", "\u00a7$1");
+ if (player.hasPermission("purpur.sign.style")) line = line.replaceAll("(?i)&([l-or])", "\u00a7$1");
+ if (player.hasPermission("purpur.sign.magic")) line = line.replaceAll("(?i)&([kr])", "\u00a7$1");
+ lines.add(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(line));
2022-06-09 00:14:02 +08:00
} else {
2022-07-28 12:53:11 +08:00
- lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(filteredtext.raw()))); // Paper - adventure
+ lines.add(net.kyori.adventure.text.Component.text(line));
2022-06-09 00:14:02 +08:00
}
+ // Purpur end
2021-06-16 21:27:25 +08:00
}
2021-06-21 05:41:59 +08:00
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
this.cserver.getPluginManager().callEvent(event);
2021-06-16 21:27:25 +08:00
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index def4fdd2c7e4f925fa128692a744e5d10ae0203a..73382580cc23cbc868a6003e74826a5557c8afc5 100644
2021-06-16 21:27:25 +08:00
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
2022-06-09 02:35:27 +08:00
@@ -184,6 +184,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
2021-11-30 20:28:52 +08:00
return ClientboundBlockEntityDataPacket.create(this);
2021-06-16 21:27:25 +08:00
}
+ // Purpur start
+ public ClientboundBlockEntityDataPacket getTranslatedUpdatePacket(boolean filtered) {
2021-11-30 20:28:52 +08:00
+ final CompoundTag nbt = new CompoundTag();
+ this.saveAdditional(nbt);
+ final Component[] lines = getMessages(filtered);
2021-11-30 20:28:52 +08:00
+ for (int i = 0; i < 4; i++) {
+ final var component = io.papermc.paper.adventure.PaperAdventure.asAdventure(lines[i]);
Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a90092e Updated Upstream (CraftBukkit/Spigot) (#7848) PaperMC/Paper@79e07f3 Fix addPassenger for Marker (#7762) PaperMC/Paper@182a609 Fix duplicate world keys via createWorld (#7614) PaperMC/Paper@b6a6544 Provide ComponentSerializer services (#7527) PaperMC/Paper@3f7fbe3 Fix cb's janky level name in WorldCreator (#7851) PaperMC/Paper@af3b377 Update ForgeFlower (#7857) PaperMC/Paper@9667181 Fix OfflinePlayer#getBedSpawnLocation (#7861) PaperMC/Paper@c123915 Fix FurnaceInventory for smokers and blast furnaces (#7249) PaperMC/Paper@f7382f5 Remove unneeded UOE when copying biome sources (#7629) PaperMC/Paper@6b035fd Update default vanilla command perms (#7386) PaperMC/Paper@f210f67 Update the rewriteForIde for new cb package version (#7242) PaperMC/Paper@3f7111d Fix EntityEquipment and related javadocs (#7380) PaperMC/Paper@78e6431 Add default kick msg component (#6886) PaperMC/Paper@04e1b07 Check HAProxyMessage type is PROXY (#7864) PaperMC/Paper@00c6ae8 Implement Translatable on CreativeCategory (#7587) PaperMC/Paper@7602dd2 Sanitize Sent BlockEntity NBT (#7010) PaperMC/Paper@2d17a50 Add translation keys to GameMode enum (#7081) PaperMC/Paper@c5caee3 Prevent entity loading causing async lookups (#7553) PaperMC/Paper@71fe3c6 Add numeric string completion suggestions as int suggestions (#6360) PaperMC/Paper@b1ac25f Respect x-ray permission in World#refreshChunk (#7214) Pufferfish Changes: pufferfish-gg/Pufferfish@6186c1f Updated Upstream (Paper) pufferfish-gg/Pufferfish@b235d83 Fix regression with SIMD vector sizes not matching 256-bits pufferfish-gg/Pufferfish@27cb1ac Updated Upstream (Paper)
2022-06-02 22:10:09 +08:00
+ final String line = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().serialize(component);
+ final var text = net.kyori.adventure.text.Component.text(line);
+ final String json = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().serialize(text);
+ nbt.putString("Text" + (i + 1), json);
2021-06-16 21:27:25 +08:00
+ }
+ nbt.putString("PurpurEditor", "true");
2021-11-30 20:28:52 +08:00
+ return ClientboundBlockEntityDataPacket.create(this, entity -> nbt);
2021-06-16 21:27:25 +08:00
+ }
+ // Purpur end
+
@Override
2021-11-30 20:28:52 +08:00
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
2021-11-29 21:30:53 +08:00
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f01a70c5efb62022f86fba47c5baf432f728daf2..407cdadb54eee58a415504c2219829054b40204a 100644
2021-11-29 21:30:53 +08:00
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -933,8 +933,10 @@ public class PurpurWorldConfig {
2021-06-16 21:27:25 +08:00
}
public boolean signRightClickEdit = false;
2021-11-30 20:28:52 +08:00
+ public boolean signAllowColors = false;
2021-06-16 21:27:25 +08:00
private void signSettings() {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
2021-11-30 20:28:52 +08:00
+ signAllowColors = getBoolean("blocks.sign.allow-colors", signAllowColors);
2021-06-16 21:27:25 +08:00
}
2021-11-30 20:28:52 +08:00
public boolean slabHalfBreak = false;