2023-07-08 11:04:19 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Fri, 23 Jun 2023 12:16:28 -0700
|
2024-08-17 23:36:27 +02:00
|
|
|
Subject: [PATCH] More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
|
2024-08-17 23:36:27 +02:00
|
|
|
Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
|
2023-07-08 11:04:19 +02: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
|
2024-08-17 23:36:27 +02:00
|
|
|
index bfe8029852385875af4ebe73c63e688f61042021..3070cd2b588f5a69fd8c0d3551e16251680d8c27 100644
|
2023-07-08 11:04:19 +02: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
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -68,12 +68,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
|
2023-07-08 11:04:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean isFacingFrontText(net.minecraft.world.entity.player.Player player) {
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper start - More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
+ return this.isFacingFrontText(player.getX(), player.getZ());
|
|
|
|
+ }
|
|
|
|
+ public boolean isFacingFrontText(double x, double z) {
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper end - More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
Block block = this.getBlockState().getBlock();
|
|
|
|
|
2024-04-25 00:36:49 +02:00
|
|
|
if (block instanceof SignBlock blocksign) {
|
2023-07-08 11:04:19 +02:00
|
|
|
Vec3 vec3d = blocksign.getSignHitboxCenterPosition(this.getBlockState());
|
|
|
|
- double d0 = player.getX() - ((double) this.getBlockPos().getX() + vec3d.x);
|
|
|
|
- double d1 = player.getZ() - ((double) this.getBlockPos().getZ() + vec3d.z);
|
2024-08-17 23:36:27 +02:00
|
|
|
+ double d0 = x - ((double) this.getBlockPos().getX() + vec3d.x); // Paper - More Sign Block API
|
|
|
|
+ double d1 = z - ((double) this.getBlockPos().getZ() + vec3d.z); // Paper - More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
float f = blocksign.getYRotationDegrees(this.getBlockState());
|
|
|
|
float f1 = (float) (Mth.atan2(d1, d0) * 57.2957763671875D) - 90.0F;
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
2024-08-17 23:36:27 +02:00
|
|
|
index 8303343ecca91076839f4436d6b3a3bf4739c2fd..e3c333d26dea9af9dd51e1662f81f1d472ab0233 100644
|
2023-07-08 11:04:19 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
2024-08-17 23:36:27 +02:00
|
|
|
@@ -198,6 +198,26 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
|
2023-07-08 11:04:19 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper start - More Sign Block API
|
|
|
|
+ @Override
|
|
|
|
+ public java.util.UUID getAllowedEditorUniqueId() {
|
|
|
|
+ this.ensureNoWorldGeneration();
|
|
|
|
+ return this.getTileEntity().getPlayerWhoMayEdit();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setAllowedEditorUniqueId(java.util.UUID uuid) {
|
|
|
|
+ this.ensureNoWorldGeneration();
|
|
|
|
+ this.getTileEntity().setAllowedPlayerEditor(uuid);
|
|
|
|
+ }
|
|
|
|
+
|
2023-07-08 11:04:19 +02:00
|
|
|
+ @Override
|
|
|
|
+ public Side getInteractableSideFor(final double x, final double z) {
|
|
|
|
+ this.requirePlaced();
|
|
|
|
+ return this.getSnapshot().isFacingFrontText(x, z) ? Side.FRONT : Side.BACK;
|
|
|
|
+ }
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper end - More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
+
|
|
|
|
public static Component[] sanitizeLines(String[] lines) {
|
|
|
|
Component[] components = new Component[4];
|
|
|
|
|