SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Directly build Art (#11813)

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-27 16:07:48 -08:00
committed by GitHub
parent 33411ec0a1
commit 0629524cb2
7 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
View File

@@ -41,7 +41,7 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
return CraftRegistry.registry;
}
public static <E> net.minecraft.core.Registry<E> getMinecraftRegistry(ResourceKey<net.minecraft.core.Registry<E>> key) {
public static <E> net.minecraft.core.Registry<E> getMinecraftRegistry(ResourceKey<? extends net.minecraft.core.Registry<E>> key) {
return CraftRegistry.getMinecraftRegistry().lookupOrThrow(key);
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
View File

@@ -16,7 +16,7 @@ public class CraftPainting extends CraftHanging implements Painting {
@Override
public Art getArt() {
return org.bukkit.craftbukkit.CraftRegistry.unwrapAndConvertHolder(org.bukkit.Registry.ART, this.getHandle().getVariant()).orElseThrow(() -> new IllegalStateException("Inlined painting variants are not supported yet in the API!")); // Paper
return CraftArt.minecraftHolderToBukkit(this.getHandle().getVariant());
}
@Override