fancynpcs: Fix cat, chicken, cow, frog, pig and wolf attributes

plugins/fancynpcs/VERSION

@@ -1 +1 @@
-2.5.0.263
+2.5.0.264

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CatAttributes.java

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_5.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.animal.Cat;
 import net.minecraft.world.entity.animal.CatVariant;
 import net.minecraft.world.item.DyeColor;
@@ -82,10 +82,7 @@ public class CatAttributes {
     }
 
     private static HolderLookup.RegistryLookup<CatVariant> getCatVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CAT_VARIANT);
-                .createLookup()
-                .lookup(Registries.CAT_VARIANT)
-                .orElseThrow();
     }
 
     private static void setCollarColor(Npc npc, String value) {
@@ -99,7 +96,7 @@ public class CatAttributes {
 
         try {
             DyeColor color = DyeColor.valueOf(value.toUpperCase());
-            if (!cat.isTame()){
+            if (!cat.isTame()) {
                 cat.setTame(true, false);
             }
             cat.setCollarColor(color);

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/ChickenAttributes.java

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_5.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.animal.Chicken;
 import net.minecraft.world.entity.animal.ChickenVariant;
 import org.bukkit.entity.EntityType;
@@ -48,10 +48,7 @@ public class ChickenAttributes {
     }
 
     private static HolderLookup.RegistryLookup<ChickenVariant> getChickenVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CHICKEN_VARIANT);
-                .createLookup()
-                .lookup(Registries.CHICKEN_VARIANT)
-                .orElseThrow();
     }
 
 }

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CowAttributes.java

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_5.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.animal.Cow;
 import net.minecraft.world.entity.animal.CowVariant;
 import org.bukkit.entity.EntityType;
@@ -48,10 +48,7 @@ public class CowAttributes {
     }
 
     private static HolderLookup.RegistryLookup<CowVariant> getCowVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.COW_VARIANT);
-                .createLookup()
-                .lookup(Registries.COW_VARIANT)
-                .orElseThrow();
     }
 
 }

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/FrogAttributes.java

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_5.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.animal.frog.Frog;
 import net.minecraft.world.entity.animal.frog.FrogVariant;
 import org.bukkit.entity.EntityType;
@@ -48,9 +48,6 @@ public class FrogAttributes {
     }
 
     private static HolderLookup.RegistryLookup<FrogVariant> getFrogVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.FROG_VARIANT);
-                .createLookup()
-                .lookup(Registries.FROG_VARIANT)
-                .orElseThrow();
     }
 }

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/PigAttributes.java

@@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_5.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.animal.Pig;
 import net.minecraft.world.entity.animal.PigVariant;
@@ -67,10 +67,7 @@ public class PigAttributes {
     }
 
     private static HolderLookup.RegistryLookup<PigVariant> getPigVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.PIG_VARIANT);
-                .createLookup()
-                .lookup(Registries.PIG_VARIANT)
-                .orElseThrow();
     }
 
 }

plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/WolfAttributes.java

@@ -7,11 +7,11 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
-import net.minecraft.world.item.DyeColor;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.animal.wolf.Wolf;
 import net.minecraft.world.entity.animal.wolf.WolfVariant;
+import net.minecraft.world.item.DyeColor;
 import org.bukkit.entity.EntityType;
 
 import java.util.ArrayList;
@@ -112,7 +112,7 @@ public class WolfAttributes {
 
         try {
             DyeColor color = DyeColor.valueOf(value.toUpperCase());
-            if (!wolf.isTame()){
+            if (!wolf.isTame()) {
                 wolf.setTame(true, false);
             }
             wolf.setCollarColor(color);
@@ -122,9 +122,6 @@ public class WolfAttributes {
     }
 
     private static HolderLookup.RegistryLookup<WolfVariant> getWolfVariantRegistry() {
-        return VanillaRegistries
+        return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.WOLF_VARIANT);
-                .createLookup()
-                .lookup(Registries.WOLF_VARIANT)
-                .orElseThrow();
     }
 }