1cfd363d32
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: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
164 lines
6 KiB
Diff
164 lines
6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 6 Jan 2021 00:34:10 -0800
|
|
Subject: [PATCH] Implement Keyed on World
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 26c512e24c7c0370dfe8529c447ba0dc3736c1c6..9f77415577a6ea3f6fda6c3077cdbf123ce47674 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -791,6 +791,18 @@ public final class Bukkit {
|
|
public static World getWorld(@NotNull UUID uid) {
|
|
return server.getWorld(uid);
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the world from the given NamespacedKey
|
|
+ *
|
|
+ * @param worldKey the NamespacedKey of the world to retrieve
|
|
+ * @return a world with the given NamespacedKey, or null if none exists
|
|
+ */
|
|
+ @Nullable
|
|
+ public static World getWorld(@NotNull NamespacedKey worldKey) {
|
|
+ return server.getWorld(worldKey);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Create a new virtual {@link WorldBorder}.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index f8226ce49584a9086208037f2c8fe369ae7bfbf0..b0cfe2e72d404aca204a0a1a43e4ba4e0c44ac98 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -673,6 +673,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@Nullable
|
|
public World getWorld(@NotNull UUID uid);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the world from the given NamespacedKey
|
|
+ *
|
|
+ * @param worldKey the NamespacedKey of the world to retrieve
|
|
+ * @return a world with the given NamespacedKey, or null if none exists
|
|
+ */
|
|
+ @Nullable
|
|
+ public World getWorld(@NotNull NamespacedKey worldKey);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Create a new virtual {@link WorldBorder}.
|
|
* <p>
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 513de620accbee93a04ef729dd386dadba566a8f..caa674ed1e4b3a940cee05a79d1af47b20e3badb 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents a world, which may contain entities, chunks and blocks
|
|
*/
|
|
-public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, net.kyori.adventure.audience.ForwardingAudience { // Paper
|
|
+public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, net.kyori.adventure.audience.ForwardingAudience, Keyed { // Paper
|
|
|
|
// Paper start
|
|
/**
|
|
@@ -1529,6 +1529,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
|
|
@NotNull
|
|
java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent);
|
|
+
|
|
+ /**
|
|
+ * Get the world's key
|
|
+ *
|
|
+ * @return the world's key
|
|
+ */
|
|
+ @NotNull
|
|
+ @Override
|
|
+ NamespacedKey getKey();
|
|
// Paper end
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java
|
|
index cbe6b3a1ba7b04826d97c3558e8eb4e5ba11f92f..9fab6eed92c27ec9dd123171f5c4e1e7cda723e4 100644
|
|
--- a/src/main/java/org/bukkit/WorldCreator.java
|
|
+++ b/src/main/java/org/bukkit/WorldCreator.java
|
|
@@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
|
|
* Represents various types of options that may be used to create a world.
|
|
*/
|
|
public class WorldCreator {
|
|
+ private final NamespacedKey key; // Paper
|
|
private final String name;
|
|
private long seed;
|
|
private World.Environment environment = World.Environment.NORMAL;
|
|
@@ -28,13 +29,67 @@ public class WorldCreator {
|
|
* @param name Name of the world that will be created
|
|
*/
|
|
public WorldCreator(@NotNull String name) {
|
|
- if (name == null) {
|
|
- throw new IllegalArgumentException("World name cannot be null");
|
|
- }
|
|
+ // Paper start
|
|
+ this(name, NamespacedKey.minecraft(name.toLowerCase(java.util.Locale.ENGLISH).replace(" ", "_")));
|
|
+ }
|
|
|
|
- this.name = name;
|
|
+ /**
|
|
+ * Creates an empty WorldCreator for the given world name and key
|
|
+ *
|
|
+ * @param levelName LevelName of the world that will be created
|
|
+ * @param worldKey NamespacedKey of the world that will be created
|
|
+ */
|
|
+ public WorldCreator(@NotNull String levelName, @NotNull NamespacedKey worldKey) {
|
|
+ if (levelName == null || worldKey == null) {
|
|
+ throw new IllegalArgumentException("World name and key cannot be null");
|
|
+ }
|
|
+ this.name = levelName;
|
|
this.seed = (new Random()).nextLong();
|
|
+ this.key = worldKey;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates an empty WorldCreator for the given key.
|
|
+ * LevelName will be the Key part of the NamespacedKey.
|
|
+ *
|
|
+ * @param worldKey NamespacedKey of the world that will be created
|
|
+ */
|
|
+ public WorldCreator(@NotNull NamespacedKey worldKey) {
|
|
+ this(worldKey.getKey(), worldKey);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the key for this WorldCreator
|
|
+ *
|
|
+ * @return the key
|
|
+ */
|
|
+ @NotNull
|
|
+ public NamespacedKey key() {
|
|
+ return key;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates an empty WorldCreator for the given world name and key
|
|
+ *
|
|
+ * @param levelName LevelName of the world that will be created
|
|
+ * @param worldKey NamespacedKey of the world that will be created
|
|
+ */
|
|
+ @NotNull
|
|
+ public static WorldCreator ofNameAndKey(@NotNull String levelName, @NotNull NamespacedKey worldKey) {
|
|
+ return new WorldCreator(levelName, worldKey);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates an empty WorldCreator for the given key.
|
|
+ * LevelName will be the Key part of the NamespacedKey.
|
|
+ *
|
|
+ * @param worldKey NamespacedKey of the world that will be created
|
|
+ */
|
|
+ @NotNull
|
|
+ public static WorldCreator ofKey(@NotNull NamespacedKey worldKey) {
|
|
+ return new WorldCreator(worldKey);
|
|
}
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Copies the options from the specified world
|