SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests 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

16
paper-api/src/main/java/org/bukkit/block/BlockType.java
View File

@@ -1,6 +1,5 @@
package org.bukkit.block;
import com.google.common.base.Preconditions;
import java.util.function.Consumer;
import org.bukkit.Keyed;
import org.bukkit.Material;
@@ -108,6 +107,7 @@ import org.bukkit.block.data.type.TrialSpawner;
import org.bukkit.block.data.type.Tripwire;
import org.bukkit.block.data.type.TripwireHook;
import org.bukkit.block.data.type.TurtleEgg;
import org.bukkit.block.data.type.Vault;
import org.bukkit.block.data.type.Wall;
import org.bukkit.block.data.type.WallHangingSign;
import org.bukkit.block.data.type.WallSign;
@@ -3295,16 +3295,20 @@ public interface BlockType extends Keyed, Translatable {
* BlockData: {@link TrialSpawner}
*/
BlockType.Typed<TrialSpawner> TRIAL_SPAWNER = getBlockType("trial_spawner");
/**
* BlockData: {@link Vault}
*/
BlockType.Typed<Vault> VAULT = getBlockType("vault");
/**
* BlockData: {@link Waterlogged}
*/
BlockType.Typed<Waterlogged> HEAVY_CORE = getBlockType("heavy_core");
//</editor-fold>
@NotNull
private static <B extends BlockType> B getBlockType(@NotNull String key) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(key);
BlockType blockType = Registry.BLOCK.get(namespacedKey);
Preconditions.checkNotNull(blockType, "No BlockType found for %s. This is a bug.", namespacedKey);
// Cast instead of using BlockType#typed, since block type can be a mock during testing and would return null
return (B) blockType;
return (B) Registry.BLOCK.getOrThrow(NamespacedKey.minecraft(key));
}
/**

6
paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
View File

@@ -100,11 +100,7 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
@NotNull
private static PatternType getType(@NotNull String key) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(key);
PatternType type = Registry.BANNER_PATTERN.get(namespacedKey);
Preconditions.checkNotNull(type, "No Banner Pattern found for %s. This is a bug.", namespacedKey);
return type;
return Registry.BANNER_PATTERN.getOrThrow(NamespacedKey.minecraft(key));
}
/**