2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Tue, 7 Jul 2020 10:53:22 -0700
|
|
|
|
Subject: [PATCH] More World API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.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 24ce9966140730c581c0709b14280e62a58331fa..d09c6b7c7b80f1f59e052ddb4aa8ad05b63fca2b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
+++ b/src/main/java/org/bukkit/World.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
|
|
|
@@ -3824,6 +3824,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
2021-06-11 14:02:28 +02:00
|
|
|
@Nullable
|
2022-07-04 16:38:06 +02:00
|
|
|
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Locates the nearest biome based on an origin, biome type, and radius to search.
|
|
|
|
+ * Step defaults to {@code 8}.
|
|
|
|
+ *
|
|
|
|
+ * @param origin Origin location
|
|
|
|
+ * @param biome Biome to find
|
|
|
|
+ * @param radius radius to search
|
|
|
|
+ * @return Location of biome or null if not found in specified radius
|
2023-10-22 21:12:00 +02:00
|
|
|
+ * @deprecated use {@link #locateNearestBiome(Location, int, Biome...)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-10-22 21:12:00 +02:00
|
|
|
+ @Deprecated
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
2023-10-22 21:12:00 +02:00
|
|
|
+ default Location locateNearestBiome(@NotNull Location origin, @NotNull Biome biome, int radius) {
|
|
|
|
+ return java.util.Optional.ofNullable(this.locateNearestBiome(origin, radius, 8, 8, biome)).map(BiomeSearchResult::getLocation).orElse(null);
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Locates the nearest biome based on an origin, biome type, and radius to search
|
|
|
|
+ * and step
|
|
|
|
+ *
|
|
|
|
+ * @param origin Origin location
|
|
|
|
+ * @param biome Biome to find
|
|
|
|
+ * @param radius radius to search
|
|
|
|
+ * @param step Search step 1 would mean checking every block, 8 would be every 8th block
|
|
|
|
+ * @return Location of biome or null if not found in specified radius
|
2023-10-22 21:12:00 +02:00
|
|
|
+ * @deprecated use {@link #locateNearestBiome(Location, int, int, int, Biome...)}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-10-22 21:12:00 +02:00
|
|
|
+ @Deprecated
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Nullable
|
2023-10-22 21:12:00 +02:00
|
|
|
+ default Location locateNearestBiome(@NotNull Location origin, @NotNull Biome biome, int radius, int step) {
|
|
|
|
+ return java.util.Optional.ofNullable(this.locateNearestBiome(origin, radius, step, step, biome)).map(BiomeSearchResult::getLocation).orElse(null);
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if the world:
|
|
|
|
+ * <ul>
|
|
|
|
+ * <li>evaporates water</li>
|
|
|
|
+ * <li>dries sponges</li>
|
|
|
|
+ * <li>has lava spread faster and further</li>
|
|
|
|
+ * </ul>
|
|
|
|
+ *
|
|
|
|
+ * @return true if ultrawarm, false if not
|
2021-08-13 19:08:34 +02:00
|
|
|
+ * @deprecated use {@link #isUltraWarm()}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-06-07 15:47:32 +02:00
|
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean isUltrawarm();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the coordinate scaling of this world.
|
|
|
|
+ *
|
|
|
|
+ * @return the coordinate scale
|
|
|
|
+ */
|
|
|
|
+ double getCoordinateScale();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if the world has skylight access
|
|
|
|
+ *
|
|
|
|
+ * @return whether there is skylight
|
2021-08-13 19:08:34 +02:00
|
|
|
+ * @deprecated use {@link #hasSkyLight()}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-06-07 15:47:32 +02:00
|
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean hasSkylight();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if the world has a bedrock ceiling
|
|
|
|
+ *
|
|
|
|
+ * @return whether the world has a bedrock ceiling
|
2021-08-13 19:08:34 +02:00
|
|
|
+ * @deprecated use {@link #hasCeiling()}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-06-07 15:47:32 +02:00
|
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean hasBedrockCeiling();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if beds work
|
|
|
|
+ *
|
|
|
|
+ * @return whether beds work
|
2021-08-13 19:08:34 +02:00
|
|
|
+ * @deprecated use {@link #isBedWorks()}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-06-07 15:47:32 +02:00
|
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean doesBedWork();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if respawn anchors work
|
|
|
|
+ *
|
|
|
|
+ * @return whether respawn anchors work
|
2021-08-13 19:08:34 +02:00
|
|
|
+ * @deprecated use {@link #isRespawnAnchorWorks()}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2023-06-07 15:47:32 +02:00
|
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean doesRespawnAnchorWork();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if this world has a fixed time
|
|
|
|
+ *
|
|
|
|
+ * @return whether this world has fixed time
|
|
|
|
+ */
|
|
|
|
+ boolean isFixedTime();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the collection of materials that burn infinitely in this world.
|
|
|
|
+ *
|
|
|
|
+ * @return the materials that will forever stay lit by fire
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ Collection<Material> getInfiniburn();
|
2021-08-21 16:26:42 +02:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Posts a specified game event at a location
|
|
|
|
+ *
|
|
|
|
+ * @param sourceEntity optional source entity
|
|
|
|
+ * @param gameEvent the game event to post
|
|
|
|
+ * @param position the position in the world where to post the event to listeners
|
|
|
|
+ */
|
|
|
|
+ void sendGameEvent(@Nullable Entity sourceEntity, @NotNull GameEvent gameEvent, @NotNull Vector position);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
// Spigot start
|
2023-12-25 23:51:56 +01:00
|
|
|
@Deprecated(forRemoval = true) // Paper
|
|
|
|
public class Spigot {
|