From e4cd9327218d53c4e72334739a7d0511b0d55c64 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 31 May 2025 14:01:03 +0200 Subject: [PATCH] fancynpcs: Fix cat, chicken, cow, frog, pig and wolf attributes --- plugins/fancynpcs/VERSION | 2 +- .../fancynpcs/v1_21_5/attributes/CatAttributes.java | 9 +++------ .../v1_21_5/attributes/ChickenAttributes.java | 7 ++----- .../fancynpcs/v1_21_5/attributes/CowAttributes.java | 7 ++----- .../fancynpcs/v1_21_5/attributes/FrogAttributes.java | 7 ++----- .../fancynpcs/v1_21_5/attributes/PigAttributes.java | 7 ++----- .../fancynpcs/v1_21_5/attributes/WolfAttributes.java | 11 ++++------- 7 files changed, 16 insertions(+), 34 deletions(-) diff --git a/plugins/fancynpcs/VERSION b/plugins/fancynpcs/VERSION index e9053fe9..fde5bbbe 100644 --- a/plugins/fancynpcs/VERSION +++ b/plugins/fancynpcs/VERSION @@ -1 +1 @@ -2.5.0.263 \ No newline at end of file +2.5.0.264 \ No newline at end of file diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CatAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CatAttributes.java index e80ce702..78a0954c 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CatAttributes.java +++ b/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 getCatVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.CAT_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CAT_VARIANT); } 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); diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/ChickenAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/ChickenAttributes.java index 7c09a4e0..77a3b74f 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/ChickenAttributes.java +++ b/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 getChickenVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.CHICKEN_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.CHICKEN_VARIANT); } } diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CowAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CowAttributes.java index ec2fe9d6..eca48012 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/CowAttributes.java +++ b/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 getCowVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.COW_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.COW_VARIANT); } } diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/FrogAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/FrogAttributes.java index c8cebe07..ebe54a94 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/FrogAttributes.java +++ b/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 getFrogVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.FROG_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.FROG_VARIANT); } } diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/PigAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/PigAttributes.java index fa277f7f..d350b14f 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/PigAttributes.java +++ b/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 getPigVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.PIG_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.PIG_VARIANT); } } diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/WolfAttributes.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/WolfAttributes.java index 64ea708a..a39728bb 100644 --- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/attributes/WolfAttributes.java +++ b/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 getWolfVariantRegistry() { - return VanillaRegistries - .createLookup() - .lookup(Registries.WOLF_VARIANT) - .orElseThrow(); + return MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.WOLF_VARIANT); } }