Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-21 19:19:27 +01:00
Code Issues Projects Releases Wiki Activity

#1303: Create registry for banner pattern and cat type

Browse Source 
By: Jishuna <joshl5324@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2023-12-08 19:26:30 +11:00
parent aacf3bd308
commit a5594be1c7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java
View File

@ -7,8 +7,10 @@ import net.minecraft.world.entity.animal.CatVariant;
import net.minecraft.world.entity.animal.EntityCat; import net.minecraft.world.entity.animal.EntityCat;
import net.minecraft.world.item.EnumColor; import net.minecraft.world.item.EnumColor;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Registry;
import org.bukkit.craftbukkit.CraftRegistry; import org.bukkit.craftbukkit.CraftRegistry;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.entity.Cat; import org.bukkit.entity.Cat;
public class CraftCat extends CraftTameableAnimal implements Cat { public class CraftCat extends CraftTameableAnimal implements Cat {
@ -56,14 +58,15 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
IRegistry<CatVariant> registry = CraftRegistry.getMinecraftRegistry(Registries.CAT_VARIANT); IRegistry<CatVariant> registry = CraftRegistry.getMinecraftRegistry(Registries.CAT_VARIANT);
return Type.values()[registry.getId(minecraft)]; return Registry.CAT_VARIANT.get(CraftNamespacedKey.fromMinecraft(registry.getKey(minecraft)));
} }
public static CatVariant bukkitToMinecraft(Type bukkit) { public static CatVariant bukkitToMinecraft(Type bukkit) {
Preconditions.checkArgument(bukkit != null); Preconditions.checkArgument(bukkit != null);
return CraftRegistry.getMinecraftRegistry(Registries.CAT_VARIANT) IRegistry<CatVariant> registry = CraftRegistry.getMinecraftRegistry(Registries.CAT_VARIANT);
.byId(bukkit.ordinal());
return registry.get(CraftNamespacedKey.toMinecraft(bukkit.getKey()));
} }
} }
} }

5
paper-server/src/test/java/org/bukkit/block/banner/PatternTypeTest.java
View File

@ -3,6 +3,8 @@ package org.bukkit.block.banner;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.level.block.entity.EnumBannerPatternType; import net.minecraft.world.level.block.entity.EnumBannerPatternType;
import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.support.AbstractTestingBase; import org.bukkit.support.AbstractTestingBase;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -22,7 +24,8 @@ public class PatternTypeTest extends AbstractTestingBase {
for (PatternType bukkit : PatternType.values()) { for (PatternType bukkit : PatternType.values()) {
EnumBannerPatternType found = null; EnumBannerPatternType found = null;
for (EnumBannerPatternType nms : BuiltInRegistries.BANNER_PATTERN) { for (EnumBannerPatternType nms : BuiltInRegistries.BANNER_PATTERN) {
if (bukkit.getIdentifier().equals(nms.getHashname())) { NamespacedKey nmsKey = CraftNamespacedKey.fromMinecraft(BuiltInRegistries.BANNER_PATTERN.getKey(nms));
if (bukkit.getIdentifier().equals(nms.getHashname()) && bukkit.getKey().equals(nmsKey)) {
found = nms; found = nms;
break; break;
} }