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

Fix Registry#getKey implementation

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-21 14:56:01 -08:00
parent 54debf494f
commit 46c6f497c7
13 changed files with 164 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,14 @@
package org.bukkit.craftbukkit.block.banner;
import com.google.common.base.Preconditions;
import java.util.Locale;
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.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.block.banner.PatternType;
import org.bukkit.craftbukkit.CraftRegistry;
import org.bukkit.craftbukkit.util.Handleable;
public class CraftPatternType implements PatternType, Handleable<BannerPattern> {
public class CraftPatternType extends OldEnumHolderable<PatternType, BannerPattern> implements PatternType {
private static int count = 0;
@@ -20,7 +17,7 @@ public class CraftPatternType implements PatternType, Handleable<BannerPattern>
}
public static PatternType minecraftHolderToBukkit(Holder<BannerPattern> minecraft) {
return CraftPatternType.minecraftToBukkit(minecraft.value());
return CraftRegistry.minecraftHolderToBukkit(minecraft, Registry.BANNER_PATTERN);
}
public static BannerPattern bukkitToMinecraft(PatternType bukkit) {
@@ -28,86 +25,11 @@ public class CraftPatternType implements PatternType, Handleable<BannerPattern>
}
public static Holder<BannerPattern> bukkitToMinecraftHolder(PatternType bukkit) {
Preconditions.checkArgument(bukkit != null);
net.minecraft.core.Registry<BannerPattern> registry = CraftRegistry.getMinecraftRegistry(Registries.BANNER_PATTERN);
if (registry.wrapAsHolder(CraftPatternType.bukkitToMinecraft(bukkit)) instanceof Holder.Reference<BannerPattern> holder) {
return holder;
}
throw new IllegalArgumentException("No Reference holder found for " + bukkit
+ ", this can happen if a plugin creates its own banner pattern without properly registering it.");
return CraftRegistry.bukkitToMinecraftHolder(bukkit, Registries.BANNER_PATTERN);
}
private final NamespacedKey key;
private final BannerPattern bannerPatternType;
private final String name;
private final int ordinal;
public CraftPatternType(NamespacedKey key, BannerPattern bannerPatternType) {
this.key = key;
this.bannerPatternType = bannerPatternType;
// For backwards compatibility, minecraft values will stile return the uppercase name without the namespace,
// in case plugins use for example the name as key in a config file to receive pattern type specific values.
// Custom pattern types will return the key with namespace. For a plugin this should look than like a new pattern type
// (which can always be added in new minecraft versions and the plugin should therefore handle it accordingly).
if (NamespacedKey.MINECRAFT.equals(key.getNamespace())) {
this.name = key.getKey().toUpperCase(Locale.ROOT);
} else {
this.name = key.toString();
}
this.ordinal = CraftPatternType.count++;
}
@Override
public BannerPattern getHandle() {
return this.bannerPatternType;
}
@Override
public NamespacedKey getKey() {
if (true) return java.util.Objects.requireNonNull(org.bukkit.Registry.BANNER_PATTERN.getKey(this), () -> this + " doesn't have a key"); // Paper
return this.key;
}
@Override
public int compareTo(PatternType patternType) {
return this.ordinal - patternType.ordinal();
}
@Override
public String name() {
return this.name;
}
@Override
public int ordinal() {
return this.ordinal;
}
@Override
public String toString() {
// For backwards compatibility
return this.name();
}
@Override
public boolean equals(Object other) {
if (this == other) {
return true;
}
if (!(other instanceof CraftPatternType)) {
return false;
}
return this.getKey().equals(((PatternType) other).getKey());
}
@Override
public int hashCode() {
return this.getKey().hashCode();
public CraftPatternType(Holder<BannerPattern> bannerPatternType) {
super(bannerPatternType, count++);
}
@Override