geforkt von Mirrors/Paper
789bc79280
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: c9a46ebf #653: Add World#spawn with randomizeData parameter e49c2e3a Damageable should extend ItemMeta 01ff04f4 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API ca5b4b1a SPIGOT-6697: Deprecate generateTree with BlockChangeDelegate as it does not handle tiles CraftBukkit Changes: 7c8bbcbe SPIGOT-6716: Preserve the order of stored enchantments of enchanted books. 18027d02 #914: Add World#spawn with randomizeData parameter 3cad0316 SPIGOT-6714: Don't fire PlayerBucketEvent when empty 8c6d60cf Fix server crash with BlockPopulator when entities are at a negative chunk border 4f6bcc84 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API 78d5b35b SPIGOT-6697: Restore generateTree with BlockChangeDelegate behaviour 15792f0d Rebuild patch c949675e SPIGOT-6713: Cancelling EntityTransformEvent Causes Deceased Slimes To Not Despawn a955f15c Fix issues with new ChunkGenerator API a0a37f41 SPIGOT-6630: Replacing an enchantment on an item creates a conflict error Spigot Changes: b166a49b Rebuild patches 3c1fc60a SPIGOT-6693: Composters only take in one item at custom hopper speeds
165 Zeilen
6.0 KiB
Diff
165 Zeilen
6.0 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 9cd632751c7e15c79b65209d69c76e8ae1916deb..fa99f414c2ce515bbdb6d8ca7bb94aa2ad1f640a 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -663,6 +663,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
|
|
|
|
/**
|
|
* Gets the map from the given item ID.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 3e77a6a294afa41e3dd0e5288b4a761d77ee18ff..14dc56c8e7702e63875f6d2f8aa804a109107456 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -561,6 +561,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
|
|
+
|
|
/**
|
|
* Gets the map from the given item ID.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 61403e0d86ef3ab799dfcf490830e515f064bd73..00fc240c2da96d937ade789a1110190d6cd79254 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents a world, which may contain entities, chunks and blocks
|
|
*/
|
|
-public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, net.kyori.adventure.audience.ForwardingAudience { // Paper
|
|
+public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, net.kyori.adventure.audience.ForwardingAudience, Keyed { // Paper
|
|
|
|
// Paper start
|
|
/**
|
|
@@ -1525,6 +1525,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 60bed20c2845f9dc15ecbed81157a63d75a4c4f4..14986911b4d0099ea2c91ab2196a771b7dee4c50 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
|