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: Wed, 6 Jan 2021 00:34:10 -0800
|
2022-06-05 22:51:44 +02:00
|
|
|
Subject: [PATCH] Expand world key API
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2022-12-11 01:50:32 +01:00
|
|
|
index ceb8d207843df5ddc852d44928286648a652eedb..197cf8cdd3d51c3e01ec737981601f37764315c6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2022-08-09 09:18:08 +02:00
|
|
|
@@ -811,6 +811,18 @@ public final class Bukkit {
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
|
|
|
|
|
|
|
/**
|
2022-04-16 10:29:50 +02:00
|
|
|
* Create a new virtual {@link WorldBorder}.
|
2022-06-05 22:51:44 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
index 2fa3de66107162ccaa158b369e2c4a926ecaff92..aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa 100644
|
|
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
* A RegionAccessor gives access to getting, modifying and spawning {@link Biome}, {@link BlockState} and {@link Entity},
|
|
|
|
* as well as generating some basic structures.
|
|
|
|
*/
|
|
|
|
-public interface RegionAccessor {
|
|
|
|
+public interface RegionAccessor extends Keyed { // Paper
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Gets the {@link Biome} at the given {@link Location}.
|
|
|
|
@@ -383,5 +383,14 @@ public interface RegionAccessor {
|
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
io.papermc.paper.world.MoonPhase getMoonPhase();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the world's key
|
|
|
|
+ *
|
|
|
|
+ * @return the world's key
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ @Override
|
|
|
|
+ NamespacedKey getKey();
|
|
|
|
// Paper end
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2022-12-11 01:50:32 +01:00
|
|
|
index 02b898d441c42771903d5839c3cde544b1a25778..1a3b4f20c7126caf8a34040028f735083bf47150 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2022-08-09 09:18:08 +02:00
|
|
|
@@ -671,6 +671,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2021-06-11 14:02:28 +02:00
|
|
|
@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
|
|
|
|
+
|
|
|
|
/**
|
2022-04-16 10:29:50 +02:00
|
|
|
* Create a new virtual {@link WorldBorder}.
|
|
|
|
* <p>
|
2022-05-27 17:42:36 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
2023-02-19 15:57:10 +01:00
|
|
|
index e5e91f4b4492fa1e709d81f313aac80761ab9e07..3545313f1c592e29d0bb5d055fc4e5c71c8a6fca 100644
|
2022-05-27 17:42:36 +02:00
|
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
2023-02-19 15:57:10 +01:00
|
|
|
@@ -142,5 +142,10 @@ public interface UnsafeValues {
|
2022-05-27 17:42:36 +02:00
|
|
|
* @throws IllegalArgumentException if there isn't a registry for that type
|
|
|
|
*/
|
|
|
|
<T extends Keyed> @org.jetbrains.annotations.NotNull Registry<T> registryFor(Class<T> classOfT);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Just don't use it.
|
|
|
|
+ */
|
|
|
|
+ @org.jetbrains.annotations.NotNull String getMainLevelName();
|
|
|
|
// Paper end
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java
|
2022-05-27 17:42:36 +02:00
|
|
|
index cbe6b3a1ba7b04826d97c3558e8eb4e5ba11f92f..cbdcac688afb7c13dd7058fa522bbd2c5adc445e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/WorldCreator.java
|
|
|
|
+++ b/src/main/java/org/bukkit/WorldCreator.java
|
2021-08-25 09:59:26 +02:00
|
|
|
@@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
|
2021-06-11 14:02:28 +02:00
|
|
|
* 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;
|
2022-05-27 17:42:36 +02:00
|
|
|
@@ -28,13 +29,80 @@ public class WorldCreator {
|
2021-06-11 14:02:28 +02:00
|
|
|
* @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
|
2022-05-27 17:42:36 +02:00
|
|
|
+ this(name, getWorldKey(name));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static NamespacedKey getWorldKey(String name) {
|
|
|
|
+ final String mainLevelName = Bukkit.getUnsafe().getMainLevelName();
|
|
|
|
+ if (name.equals(mainLevelName)) {
|
|
|
|
+ return NamespacedKey.minecraft("overworld");
|
|
|
|
+ } else if (name.equals(mainLevelName + "_nether")) {
|
|
|
|
+ return NamespacedKey.minecraft("the_nether");
|
|
|
|
+ } else if (name.equals(mainLevelName + "_the_end")) {
|
|
|
|
+ return NamespacedKey.minecraft("the_end");
|
|
|
|
+ } else {
|
|
|
|
+ return NamespacedKey.minecraft(name.toLowerCase(java.util.Locale.ENGLISH).replace(" ", "_"));
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
|
|
|
|
- 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
|