mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-16 07:35:35 +01:00
ac554ad46d
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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
162 lines
5.1 KiB
Diff
162 lines
5.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: dfsek <dfsek@protonmail.com>
|
|
Date: Sat, 19 Jun 2021 20:15:29 -0700
|
|
Subject: [PATCH] Add more LimitedRegion API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/generator/LimitedRegion.java b/src/main/java/org/bukkit/generator/LimitedRegion.java
|
|
index 85faeeeef908243aa5f172284784e7e67995ebfb..e0b249d328f7671894cea94bc00d54ab54aacd36 100644
|
|
--- a/src/main/java/org/bukkit/generator/LimitedRegion.java
|
|
+++ b/src/main/java/org/bukkit/generator/LimitedRegion.java
|
|
@@ -4,6 +4,12 @@ import java.util.List;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.RegionAccessor;
|
|
import org.bukkit.block.BlockState;
|
|
+// Paper start
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.block.data.BlockData;
|
|
+import org.bukkit.util.Vector;
|
|
+// Paper end
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
/**
|
|
@@ -53,4 +59,137 @@ public interface LimitedRegion extends RegionAccessor {
|
|
*/
|
|
@NotNull
|
|
List<BlockState> getTileEntities();
|
|
+
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sets the block at a vector location to the provided {@link BlockData}.
|
|
+ *
|
|
+ * @param vector {@link Vector} representing the position of the block to set.
|
|
+ * @param data {@link BlockData} to set the block at the provided coordinates to.
|
|
+ */
|
|
+ default void setBlockData(@NotNull Vector vector, @NotNull BlockData data) {
|
|
+ setBlockData(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ(), data);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link BlockState} at a location.
|
|
+ *
|
|
+ * @param x X coordinate.
|
|
+ * @param y Y coordinate.
|
|
+ * @param z Z coordinate.
|
|
+ * @param state The block state.
|
|
+ */
|
|
+ void setBlockState(int x, int y, int z, @NotNull BlockState state);
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link BlockState} at a location.
|
|
+ *
|
|
+ * @param location Location to set block state.
|
|
+ * @param state The block state.
|
|
+ */
|
|
+ default void setBlockState(@NotNull Vector location, @NotNull BlockState state) {
|
|
+ setBlockState(location.getBlockX(), location.getBlockY(), location.getBlockZ(), state);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link BlockState} at a location.
|
|
+ *
|
|
+ * @param location Location to get block state from.
|
|
+ * @return The block state.
|
|
+ */
|
|
+ @NotNull
|
|
+ default BlockState getBlockState(@NotNull Vector location) {
|
|
+ return getBlockState(location.getBlockX(), location.getBlockY(), location.getBlockZ());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Schedules a block update at (x, y, z).
|
|
+ *
|
|
+ * @param x X coordinate
|
|
+ * @param y Y coordinate
|
|
+ * @param z Z coordinate
|
|
+ */
|
|
+ void scheduleBlockUpdate(int x, int y, int z);
|
|
+
|
|
+ /**
|
|
+ * Schedules a block update at a vector location.
|
|
+ *
|
|
+ * @param location {@link Vector} representing the position of the block to update.
|
|
+ */
|
|
+ default void scheduleBlockUpdate(@NotNull Vector location) {
|
|
+ scheduleBlockUpdate(location.getBlockX(), location.getBlockY(), location.getBlockZ());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Schedules a fluid update at (x, y, z).
|
|
+ *
|
|
+ * @param x X coordinate
|
|
+ * @param y Y coordinate
|
|
+ * @param z Z coordinate
|
|
+ */
|
|
+ void scheduleFluidUpdate(int x, int y, int z);
|
|
+
|
|
+ /**
|
|
+ * Schedules a fluid update at a vector location.
|
|
+ *
|
|
+ * @param location {@link Vector} representing the position of the block to update.
|
|
+ */
|
|
+ default void scheduleFluidUpdate(@NotNull Vector location) {
|
|
+ scheduleFluidUpdate(location.getBlockX(), location.getBlockY(), location.getBlockZ());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link World} object this region represents.
|
|
+ * <p>
|
|
+ * Do <b>not</b> attempt to read from/write to this world! Doing so during generation <b>will cause a deadlock!</b>
|
|
+ *
|
|
+ * @return The {@link World} object that this region represents.
|
|
+ */
|
|
+ @NotNull
|
|
+ World getWorld();
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link BlockData} of the block at the provided coordinates.
|
|
+ *
|
|
+ * @param vector {@link Vector} representing the position of the block to get.
|
|
+ * @return {@link BlockData} at the coordinates
|
|
+ */
|
|
+ @NotNull
|
|
+ default BlockData getBlockData(@NotNull Vector vector) {
|
|
+ return getBlockData(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the X-coordinate of the chunk in the center of the region.
|
|
+ *
|
|
+ * @return The center chunk's X coordinate.
|
|
+ */
|
|
+ int getCenterChunkX();
|
|
+
|
|
+ /**
|
|
+ * Gets the X-coordinate of the block in the center of the region.
|
|
+ *
|
|
+ * @return The center chunk's X coordinate.
|
|
+ */
|
|
+ default int getCenterBlockX() {
|
|
+ return getCenterChunkX() << 4;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the Z-coordinate of the chunk in the center of the region.
|
|
+ *
|
|
+ * @return The center chunk's Z coordinate.
|
|
+ */
|
|
+ int getCenterChunkZ();
|
|
+
|
|
+ /**
|
|
+ * Gets the Z-coordinate of the block in the center of the region.
|
|
+ *
|
|
+ * @return The center chunk's Z coordinate.
|
|
+ */
|
|
+ default int getCenterBlockZ() {
|
|
+ return getCenterChunkZ() << 4;
|
|
+ }
|
|
+ // Paper end
|
|
}
|