mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-10 17:52:02 -07:00
Prepare for 1.19 dev
This commit is contained in:
@@ -1,89 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MiniDigger | Martin <admin@minidigger.dev>
|
||||
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
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -0,0 +0,0 @@ public final class Bukkit {
|
||||
return server.createChunkData(world);
|
||||
}
|
||||
|
||||
+ // 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
|
||||
+ * @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.
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ 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
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@NotNull
|
||||
public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
|
||||
|
||||
+ // 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
|
||||
+ * @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.
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ 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
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
||||
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
||||
@@ -0,0 +0,0 @@ public abstract class ChunkGenerator {
|
||||
return false;
|
||||
}
|
||||
|
||||
+ // 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
|
||||
+
|
||||
/**
|
||||
* Data for a Chunk.
|
||||
*/
|
Reference in New Issue
Block a user