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

Don't use delayed registries in impl anywhere (#11918)

Browse Source
This commit is contained in:
Jake Potrebic
2025-01-11 11:02:28 -08:00
committed by GitHub
parent 19ddbeff9e
commit ac3aaa248b
55 changed files with 145 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
View File

@@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.block;
import com.google.common.base.Preconditions;
import io.papermc.paper.registry.RegistryKey;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.world.level.block.AbstractBannerBlock;
@@ -39,7 +40,7 @@ public class CraftBanner extends CraftBlockEntityState<BannerBlockEntity> implem
for (int i = 0; i < banner.getPatterns().layers().size(); i++) {
BannerPatternLayers.Layer p = banner.getPatterns().layers().get(i);
// Paper start - fix upstream not handling inlined banner pattern
java.util.Optional<org.bukkit.block.banner.PatternType> type = org.bukkit.craftbukkit.CraftRegistry.unwrapAndConvertHolder(org.bukkit.Registry.BANNER_PATTERN, p.pattern());
java.util.Optional<org.bukkit.block.banner.PatternType> type = org.bukkit.craftbukkit.CraftRegistry.unwrapAndConvertHolder(RegistryKey.BANNER_PATTERN, p.pattern());
if (type.isEmpty()) continue;
this.patterns.add(new Pattern(DyeColor.getByWoolData((byte) p.color().getId()), type.get()));
// Paper end - fix upstream not handling inlined banner pattern

3
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBiome.java
View File

@@ -4,7 +4,6 @@ import java.util.Locale;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.block.Biome;
import org.bukkit.craftbukkit.CraftRegistry;
import org.bukkit.craftbukkit.util.Handleable;
@@ -15,7 +14,7 @@ public class CraftBiome implements Biome, Handleable<net.minecraft.world.level.b
private static int count = 0;
public static Biome minecraftToBukkit(net.minecraft.world.level.biome.Biome minecraft) {
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BIOME, Registry.BIOME);
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BIOME);
}
public static Biome minecraftHolderToBukkit(Holder<net.minecraft.world.level.biome.Biome> minecraft) {

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

@@ -49,7 +49,7 @@ public class CraftBlockType<B extends BlockData> implements BlockType.Typed<B>,
}
public static BlockType minecraftToBukkitNew(Block minecraft) {
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BLOCK, Registry.BLOCK);
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BLOCK);
}
public static Block bukkitToMinecraftNew(BlockType bukkit) {

5
paper-server/src/main/java/org/bukkit/craftbukkit/block/banner/CraftPatternType.java
View File

@@ -4,7 +4,6 @@ import io.papermc.paper.util.OldEnumHolderable;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.level.block.entity.BannerPattern;
import org.bukkit.Registry;
import org.bukkit.block.banner.PatternType;
import org.bukkit.craftbukkit.CraftRegistry;
@@ -13,11 +12,11 @@ public class CraftPatternType extends OldEnumHolderable<PatternType, BannerPatte
private static int count = 0;
public static PatternType minecraftToBukkit(BannerPattern minecraft) {
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BANNER_PATTERN, Registry.BANNER_PATTERN);
return CraftRegistry.minecraftToBukkit(minecraft, Registries.BANNER_PATTERN);
}
public static PatternType minecraftHolderToBukkit(Holder<BannerPattern> minecraft) {
return CraftRegistry.minecraftHolderToBukkit(minecraft, Registry.BANNER_PATTERN);
return CraftRegistry.minecraftHolderToBukkit(minecraft, Registries.BANNER_PATTERN);
}
public static BannerPattern bukkitToMinecraft(PatternType bukkit) {