2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-11-27 08:11:43 +00:00
|
|
|
From: MiniDigger <admin@benndorf.dev>
|
2021-06-11 12:02:28 +00:00
|
|
|
Date: Wed, 29 Apr 2020 02:09:17 +0200
|
|
|
|
Subject: [PATCH] Allow delegation to vanilla chunk gen
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2022-12-07 16:46:46 +00:00
|
|
|
index b0d2d45ad2394313be752e92bc594095bfc93120..85dc2bf97175207bcc169d5d7e0d86dae39aecf2 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2022-12-07 16:46:46 +00:00
|
|
|
@@ -1907,6 +1907,24 @@ public final class Bukkit {
|
2021-06-11 12:02:28 +00:00
|
|
|
return server.createChunkData(world);
|
|
|
|
}
|
2021-12-05 10:27:20 +00:00
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
|
|
|
|
+ *
|
|
|
|
+ * @param world the world to create the ChunkData for
|
|
|
|
+ * @param x the x coordinate of the chunk
|
|
|
|
+ * @param z the z coordinate of the chunk
|
|
|
|
+ * @return a new ChunkData for the world
|
2021-12-05 10:27:20 +00:00
|
|
|
+ * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
|
|
|
|
+ * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ */
|
|
|
|
+ @NotNull
|
2021-12-05 10:27:20 +00:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 12:02:28 +00:00
|
|
|
+ public static ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
|
|
|
|
+ return server.createVanillaChunkData(world, x, z);
|
|
|
|
+ }
|
|
|
|
+ // Paper stop
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Creates a boss bar instance to display to players. The progress
|
|
|
|
* defaults to 1.0
|
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2022-12-07 16:46:46 +00:00
|
|
|
index a11d02cc17b1e9bea06ab61cd3ae21c3c41aaceb..c07eef17aac9140e1f461aa20e3a90fcb3f4ae74 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2022-12-07 16:46:46 +00:00
|
|
|
@@ -1602,6 +1602,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2021-06-11 12:02:28 +00:00
|
|
|
@NotNull
|
|
|
|
public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
|
2021-12-05 10:27:20 +00:00
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
2021-12-05 10:27:20 +00:00
|
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ *
|
|
|
|
+ * @param world the world to create the ChunkData for
|
|
|
|
+ * @param x the x coordinate of the chunk
|
|
|
|
+ * @param z the z coordinate of the chunk
|
|
|
|
+ * @return a new ChunkData for the world
|
2021-12-05 10:27:20 +00:00
|
|
|
+ * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
|
|
|
|
+ * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
|
2021-06-11 12:02:28 +00:00
|
|
|
+ */
|
|
|
|
+ @NotNull
|
2021-12-05 10:27:20 +00:00
|
|
|
+ @Deprecated(forRemoval = true)
|
2021-06-11 12:02:28 +00:00
|
|
|
+ ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z);
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Creates a boss bar instance to display to players. The progress
|
|
|
|
* defaults to 1.0
|
|
|
|
diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
2022-12-03 18:19:09 +00:00
|
|
|
index acba500393e1736e6081facac6ef9ab10da655de..f1f60710ea44a078aa071dbf2d5c0ed3724e31b3 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
|
|
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
2022-12-03 18:19:09 +00:00
|
|
|
@@ -577,6 +577,22 @@ public abstract class ChunkGenerator {
|
2021-06-11 12:02:28 +00:00
|
|
|
return false;
|
|
|
|
}
|
2021-12-05 10:27:20 +00:00
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
|
|
|
|
+ *
|
|
|
|
+ * @param world the world to create the ChunkData for
|
|
|
|
+ * @param x the x coordinate of the chunk
|
|
|
|
+ * @param z the z coordinate of the chunk
|
|
|
|
+ * @return a new ChunkData for the world
|
|
|
|
+ *
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
|
|
|
|
+ return Bukkit.getServer().createVanillaChunkData(world, x, z);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
2022-12-03 18:19:09 +00:00
|
|
|
* Gets if the server should generate Vanilla structures after this
|
|
|
|
* ChunkGenerator.
|