2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Mon, 3 Sep 2018 18:13:53 -0500
|
|
|
|
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
|
|
|
|
new file mode 100644
|
2022-12-15 18:10:03 +01:00
|
|
|
index 0000000000000000000000000000000000000000..c896d172519a8552a132031cb956378db272878f
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
|
2022-12-15 18:10:03 +01:00
|
|
|
@@ -0,0 +1,67 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+package com.destroystokyo.paper.block;
|
|
|
|
+
|
2022-12-15 18:10:03 +01:00
|
|
|
+import org.bukkit.FluidCollisionMode;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import org.bukkit.block.Block;
|
|
|
|
+import org.bukkit.block.BlockFace;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents information about a targeted block
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link org.bukkit.util.RayTraceResult}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+@Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+public class TargetBlockInfo {
|
|
|
|
+ private final Block block;
|
|
|
|
+ private final BlockFace blockFace;
|
|
|
|
+
|
|
|
|
+ public TargetBlockInfo(@NotNull Block block, @NotNull BlockFace blockFace) {
|
|
|
|
+ this.block = block;
|
|
|
|
+ this.blockFace = blockFace;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the block that is targeted
|
|
|
|
+ *
|
|
|
|
+ * @return Targeted block
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public Block getBlock() {
|
|
|
|
+ return block;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the targeted BlockFace
|
|
|
|
+ *
|
|
|
|
+ * @return Targeted blockface
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public BlockFace getBlockFace() {
|
|
|
|
+ return blockFace;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the relative Block to the targeted block on the side it is targeted at
|
|
|
|
+ *
|
|
|
|
+ * @return Block relative to targeted block
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public Block getRelativeBlock() {
|
|
|
|
+ return block.getRelative(blockFace);
|
|
|
|
+ }
|
|
|
|
+
|
2022-12-15 18:10:03 +01:00
|
|
|
+ /**
|
|
|
|
+ * @deprecated use {@link org.bukkit.FluidCollisionMode}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public enum FluidMode {
|
2022-12-15 18:10:03 +01:00
|
|
|
+ NEVER(FluidCollisionMode.NEVER),
|
|
|
|
+ SOURCE_ONLY(FluidCollisionMode.SOURCE_ONLY),
|
|
|
|
+ ALWAYS(FluidCollisionMode.ALWAYS);
|
|
|
|
+
|
|
|
|
+ public final FluidCollisionMode bukkit;
|
|
|
|
+
|
|
|
|
+ FluidMode(FluidCollisionMode bukkit) {
|
|
|
|
+ this.bukkit = bukkit;
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2023-12-25 23:51:56 +01:00
|
|
|
index 3a2f5ba52c6be8930f7b411476b36afc161834c9..b7bf0cc404634693d03c6700dc50c92697951c37 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -85,6 +85,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
2021-06-11 14:02:28 +02:00
|
|
|
@NotNull
|
|
|
|
public Block getTargetBlock(@Nullable Set<Material> transparent, int maxDistance);
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Gets the block that the living entity has targeted, ignoring fluids
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @return block that the living entity has targeted,
|
|
|
|
+ * or null if no block is within maxDistance
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link #getTargetBlockExact(int)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ public default Block getTargetBlock(int maxDistance) {
|
|
|
|
+ return getTargetBlock(maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode.NEVER);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the block that the living entity has targeted
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @param fluidMode whether to check fluids or not
|
|
|
|
+ * @return block that the living entity has targeted,
|
|
|
|
+ * or null if no block is within maxDistance
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link #getTargetBlockExact(int, FluidCollisionMode)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ public Block getTargetBlock(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the blockface of that block that the living entity has targeted, ignoring fluids
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @return blockface of the block that the living entity has targeted,
|
|
|
|
+ * or null if no block is targeted
|
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ public default org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance) {
|
2022-12-15 18:10:03 +01:00
|
|
|
+ return getTargetBlockFace(maxDistance, org.bukkit.FluidCollisionMode.NEVER);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the blockface of that block that the living entity has targeted
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @param fluidMode whether to check fluids or not
|
|
|
|
+ * @return blockface of the block that the living entity has targeted,
|
|
|
|
+ * or null if no block is targeted
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link #getTargetBlockFace(int, FluidCollisionMode)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
|
|
|
|
+
|
|
|
|
+ /**
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * Gets the blockface of that block that the living entity has targeted
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @param fluidMode whether to check fluids or not
|
|
|
|
+ * @return blockface of the block that the living entity has targeted,
|
|
|
|
+ * or null if no block is targeted
|
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, @NotNull FluidCollisionMode fluidMode);
|
|
|
|
+
|
|
|
|
+ /**
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * Gets information about the block the living entity has targeted, ignoring fluids
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @return TargetBlockInfo about the block the living entity has targeted,
|
|
|
|
+ * or null if no block is targeted
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link #rayTraceBlocks(double)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ public default com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance) {
|
|
|
|
+ return getTargetBlockInfo(maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode.NEVER);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets information about the block the living entity has targeted
|
|
|
|
+ *
|
|
|
|
+ * @param maxDistance this is the maximum distance to scan
|
|
|
|
+ * @param fluidMode whether to check fluids or not
|
|
|
|
+ * @return TargetBlockInfo about the block the living entity has targeted,
|
|
|
|
+ * or null if no block is targeted
|
2022-12-15 18:10:03 +01:00
|
|
|
+ * @deprecated use {@link #rayTraceBlocks(double, FluidCollisionMode)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2022-12-15 18:10:03 +01:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
|
|
|
+ public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the last two blocks along the living entity's line of sight.
|
|
|
|
* <p>
|