mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:46:21 +01:00
52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
|
|
Date: Sun, 14 Aug 2022 12:22:54 -0400
|
|
Subject: [PATCH] Add NamespacedKey biome methods
|
|
|
|
Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
|
index 2d612f2c6b483eec6fbc7ad35d5d878359db4770..b2ab190a73946ad2a5750c2408036cc3641e23f8 100644
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
|
@@ -223,4 +223,37 @@ public interface UnsafeValues {
|
|
*/
|
|
@org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
|
|
// Paper end
|
|
+
|
|
+ // Paper start - namespaced key biome methods
|
|
+ /**
|
|
+ * Gets the {@link NamespacedKey} for the biome at the given location.
|
|
+ *
|
|
+ * @param accessor The {@link RegionAccessor} of the provided coordinates
|
|
+ * @param x X-coordinate of the block
|
|
+ * @param y Y-coordinate of the block
|
|
+ * @param z Z-coordinate of the block
|
|
+ * @deprecated custom biomes are properly supported in API now
|
|
+ * @return the biome's {@link NamespacedKey}
|
|
+ */
|
|
+ @org.jetbrains.annotations.NotNull
|
|
+ @Deprecated(since = "1.21.3", forRemoval = true)
|
|
+ NamespacedKey getBiomeKey(RegionAccessor accessor, int x, int y, int z);
|
|
+
|
|
+ /**
|
|
+ * Sets the biome at the given location to a biome registered
|
|
+ * to the given {@link NamespacedKey}. If no biome by the given
|
|
+ * {@link NamespacedKey} exists, an {@link IllegalStateException}
|
|
+ * will be thrown.
|
|
+ *
|
|
+ * @param accessor The {@link RegionAccessor} of the provided coordinates
|
|
+ * @param x X-coordinate of the block
|
|
+ * @param y Y-coordinate of the block
|
|
+ * @param z Z-coordinate of the block
|
|
+ * @param biomeKey Biome key
|
|
+ * @deprecated custom biomes are properly supported in API now
|
|
+ * @throws IllegalStateException if no biome by the given key is registered.
|
|
+ */
|
|
+ @Deprecated(since = "1.21.3", forRemoval = true)
|
|
+ void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
|
|
+ // Paper end - namespaced key biome methods
|
|
}
|