aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-07-08 02:04:19 -0700
committerGitHub <[email protected]>2023-07-08 11:04:19 +0200
commit5de0f8ac48944c6fe4dd127390a0ea08705cc2d9 (patch)
tree730a08fe45e62d2b24d21d26485c9278d1f8e777
parente1053543307a4e64990c41905f80c85cb82d17fb (diff)
downloadPaper-5de0f8ac48944c6fe4dd127390a0ea08705cc2d9.tar.gz
Paper-5de0f8ac48944c6fe4dd127390a0ea08705cc2d9.zip
Add Sign#getInteractableSideFor (#9388)
-rw-r--r--patches/api/0420-Add-Sign-getInteractableSideFor.patch46
-rw-r--r--patches/server/0982-Add-Sign-getInteractableSideFor.patch50
2 files changed, 96 insertions, 0 deletions
diff --git a/patches/api/0420-Add-Sign-getInteractableSideFor.patch b/patches/api/0420-Add-Sign-getInteractableSideFor.patch
new file mode 100644
index 0000000000..ded9bb7ac7
--- /dev/null
+++ b/patches/api/0420-Add-Sign-getInteractableSideFor.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 23 Jun 2023 12:16:35 -0700
+Subject: [PATCH] Add Sign#getInteractableSideFor
+
+
+diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
+index e6b87ad5b2099800a61e7f585a5404e9e672228a..2f90bbb1542580da5a45be881fe2143e9da96eca 100644
+--- a/src/main/java/org/bukkit/block/Sign.java
++++ b/src/main/java/org/bukkit/block/Sign.java
+@@ -166,4 +166,35 @@ public interface Sign extends TileState, Colorable {
+ */
+ @NotNull
+ public SignSide getSide(@NotNull Side side);
++
++ // Paper start - get side for player
++ /**
++ * Compute the side facing the specified entity.
++ *
++ * @param entity the entity
++ * @return the side it is facing
++ */
++ default @NotNull Side getInteractableSideFor(org.bukkit.entity.@NotNull Entity entity) {
++ return this.getInteractableSideFor(entity.getLocation());
++ }
++
++ /**
++ * Compute the side facing the specific position.
++ *
++ * @param position the position
++ * @return the side the position is facing
++ */
++ default @NotNull Side getInteractableSideFor(io.papermc.paper.math.@NotNull Position position) {
++ return this.getInteractableSideFor(position.x(), position.z());
++ }
++
++ /**
++ * Compute the side facing the specific x and z coordinates.
++ *
++ * @param x the x coord
++ * @param z the z coord
++ * @return the side the coordinates are facing
++ */
++ @NotNull Side getInteractableSideFor(double x, double z);
++ // Paper end
+ }
diff --git a/patches/server/0982-Add-Sign-getInteractableSideFor.patch b/patches/server/0982-Add-Sign-getInteractableSideFor.patch
new file mode 100644
index 0000000000..d64ad28be8
--- /dev/null
+++ b/patches/server/0982-Add-Sign-getInteractableSideFor.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 23 Jun 2023 12:16:28 -0700
+Subject: [PATCH] Add Sign#getInteractableSideFor
+
+
+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 0521240dddde12d78cc05deda7fac11690f5d155..f356196aaeb498a6d2c9ad2112329cef5a3103d6 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+@@ -64,13 +64,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+ }
+
+ public boolean isFacingFrontText(net.minecraft.world.entity.player.Player player) {
++ // Paper start
++ return this.isFacingFrontText(player.getX(), player.getZ());
++ }
++ public boolean isFacingFrontText(double x, double z) {
++ // Paper end
+ Block block = this.getBlockState().getBlock();
+
+ if (block instanceof SignBlock) {
+ SignBlock blocksign = (SignBlock) block;
+ 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);
++ double d0 = x - ((double) this.getBlockPos().getX() + vec3d.x); // Paper
++ double d1 = z - ((double) this.getBlockPos().getZ() + vec3d.z); // Paper
+ 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
+index f48b5204e59ab0c840fc08ecb9abf5facbae9be1..d34ed7d5abc53c1a09a5fe8050f6c54e27697e76 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+@@ -146,6 +146,14 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
+ }
+ // Paper end
+
++ // Paper start - side facing API
++ @Override
++ public Side getInteractableSideFor(final double x, final double z) {
++ this.requirePlaced();
++ return this.getSnapshot().isFacingFrontText(x, z) ? Side.FRONT : Side.BACK;
++ }
++ // Paper end
++
+ public static Component[] sanitizeLines(String[] lines) {
+ Component[] components = new Component[4];
+