twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

#1058: Add tests for Minecraft registry <-> Bukkit fields

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
Bukkit/Spigot
2024-09-27 08:15:05 +10:00
parent 49d12d442a
commit 42cd6c82ff
21 changed files with 147 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
paper-api/src/main/java/org/bukkit/Registry.java
View File

@@ -60,6 +60,16 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
return Bukkit.getAdvancement(key);
}
@NotNull
@Override
public Advancement getOrThrow(@NotNull NamespacedKey key) {
Advancement advancement = get(key);
Preconditions.checkArgument(advancement != null, "No registry entry found for key " + key);
return advancement;
}
@NotNull
@Override
public Stream<Advancement> stream() {
@@ -118,6 +128,16 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
return Bukkit.getBossBar(key);
}
@NotNull
@Override
public KeyedBossBar getOrThrow(@NotNull NamespacedKey key) {
KeyedBossBar keyedBossBar = get(key);
Preconditions.checkArgument(keyedBossBar != null, "No registry entry found for key " + key);
return keyedBossBar;
}
@NotNull
@Override
public Stream<KeyedBossBar> stream() {
@@ -210,13 +230,13 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
*
* @see Structure
*/
Registry<Structure> STRUCTURE = Bukkit.getRegistry(Structure.class);
Registry<Structure> STRUCTURE = Objects.requireNonNull(Bukkit.getRegistry(Structure.class), "No registry present for Structure. This is a bug.");
/**
* Server structure types.
*
* @see StructureType
*/
Registry<StructureType> STRUCTURE_TYPE = Bukkit.getRegistry(StructureType.class);
Registry<StructureType> STRUCTURE_TYPE = Objects.requireNonNull(Bukkit.getRegistry(StructureType.class), "No registry present for StructureType. This is a bug.");
/**
* Sound keys.
*
@@ -229,14 +249,14 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
* @see TrimMaterial
*/
@ApiStatus.Experimental
Registry<TrimMaterial> TRIM_MATERIAL = Bukkit.getRegistry(TrimMaterial.class);
Registry<TrimMaterial> TRIM_MATERIAL = Objects.requireNonNull(Bukkit.getRegistry(TrimMaterial.class), "No registry present for TrimMaterial. This is a bug.");
/**
* Trim patterns.
*
* @see TrimPattern
*/
@ApiStatus.Experimental
Registry<TrimPattern> TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class);
Registry<TrimPattern> TRIM_PATTERN = Objects.requireNonNull(Bukkit.getRegistry(TrimPattern.class), "No registry present for TrimPattern. This is a bug.");
/**
* Damage types.
*
@@ -282,6 +302,16 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
return MemoryKey.getByKey(key);
}
@NotNull
@Override
public MemoryKey getOrThrow(@NotNull NamespacedKey key) {
MemoryKey memoryKey = get(key);
Preconditions.checkArgument(memoryKey != null, "No registry entry found for key " + key);
return memoryKey;
}
@NotNull
@Override
public Stream<MemoryKey> stream() {
@@ -327,6 +357,18 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
@Nullable
T get(@NotNull NamespacedKey key);
/**
* Get the object by its key.
*
* If there is no object with the given key, an exception will be thrown.
*
* @param key to get the object from
* @return object with the given key
* @throws IllegalArgumentException if there is no object with the given key
*/
@NotNull
T getOrThrow(@NotNull NamespacedKey key);
/**
* Returns a new stream, which contains all registry items, which are registered to the registry.
*
@@ -381,6 +423,16 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
return map.get(key);
}
@NotNull
@Override
public T getOrThrow(@NotNull NamespacedKey key) {
T object = get(key);
Preconditions.checkArgument(object != null, "No registry entry found for key " + key);
return object;
}
@NotNull
@Override
public Stream<T> stream() {