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
|
|
|
|
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
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index f3cea7a8de334419b4a2f6dc64ef0e20fd715e75..927c7ea03560be0c86884cec70ee8e408e66cb07 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
|
2023-12-06 17:34:54 +01:00
|
|
|
@@ -66,13 +66,18 @@ 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-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Add Sign#getInteractableSideFor
|
2023-07-08 11:04:19 +02:00
|
|
|
+ return this.isFacingFrontText(player.getX(), player.getZ());
|
|
|
|
+ }
|
|
|
|
+ public boolean isFacingFrontText(double x, double z) {
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Add Sign#getInteractableSideFor
|
2023-07-08 11:04:19 +02:00
|
|
|
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);
|
2024-01-15 12:38:39 +01:00
|
|
|
+ double d0 = x - ((double) this.getBlockPos().getX() + vec3d.x); // Paper - Add Sign#getInteractableSideFor
|
|
|
|
+ double d1 = z - ((double) this.getBlockPos().getZ() + vec3d.z); // Paper - Add Sign#getInteractableSideFor
|
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-01-15 12:38:39 +01:00
|
|
|
index 3ebfc8e5b5462e6e532f8e8901fd5f8f386bbf34..2725fd91596a69e12996e838267b6612f745a4bb 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
|
2023-09-29 02:28:26 +02:00
|
|
|
@@ -169,6 +169,14 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
|
2023-07-08 11:04:19 +02:00
|
|
|
}
|
|
|
|
// 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];
|
|
|
|
|