Fix the wolf variants textures (#251)

* Fix the wolf varient in 1.21.4 being untextured

* Fix the wolf variants in 1.20.6 - 1.21.3

Author: CloveTwilight3

implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/attributes/WolfAttributes.java

@@ -56,18 +56,26 @@ private static void setAngry(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         boolean angry = Boolean.parseBoolean(value.toLowerCase());
-
         wolf.setRemainingPersistentAngerTime(angry ? 100 : 0);
     }
 
     private static void setVariant(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
-        Registry<WolfVariant> registry = wolf.level().registryAccess().registry(Registries.WOLF_VARIANT).get();
-        WolfVariant variant = registry.get(ResourceLocation.of(value.toLowerCase(), ':'));
+        Registry<WolfVariant> registry = (Registry<WolfVariant>) wolf.level().registryAccess().registryOrThrow(Registries.WOLF_VARIANT);
+
+        ResourceLocation variantLocation = ResourceLocation.tryParse("minecraft:" + value.toLowerCase());
+        if (variantLocation == null) {
+            System.out.println("Invalid variant name: " + value);
+            return;
+        }
 
+        WolfVariant variant = registry.get(variantLocation);
         if (variant != null) {
             wolf.setVariant(Holder.direct(variant));
+        } else {
+            System.out.println("Wolf variant not found: " + variantLocation);
         }
     }
+
 }

implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/attributes/WolfAttributes.java

@@ -5,6 +5,7 @@
 import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.animal.Wolf;
@@ -56,18 +57,38 @@ private static void setAngry(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         boolean angry = Boolean.parseBoolean(value.toLowerCase());
-
         wolf.setRemainingPersistentAngerTime(angry ? 100 : 0);
     }
 
     private static void setVariant(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
-        Registry<WolfVariant> registry = wolf.level().registryAccess().registry(Registries.WOLF_VARIANT).get();
-        WolfVariant variant = registry.get(ResourceLocation.parse(value.toLowerCase()));
+        Registry<?> anyRegistry = wolf.level().registryAccess().registryOrThrow(Registries.WOLF_VARIANT);
+        Registry<WolfVariant> registry = (Registry<WolfVariant>) anyRegistry;
+
+        ResourceLocation variantLocation = ResourceLocation.tryParse("minecraft:" + value.toLowerCase());
+        if (variantLocation == null) {
+            System.out.println("Invalid variant name: " + value);
+            return;
+        }
 
-        if (variant != null) {
-            wolf.setVariant(Holder.direct(variant));
+        WolfVariant variant = registry.get(variantLocation);
+        if (variant == null) {
+            System.out.println("Wolf variant not found: " + variantLocation);
+            return;
         }
+
+        // Try to get the registered key and use it to build a proper reference
+        registry.getResourceKey(variant).ifPresentOrElse(
+                key -> {
+                    // Create a bound reference using the registry + key (safe holder)
+                    Holder<WolfVariant> holder = registry.getHolderOrThrow(ResourceKey.create(Registries.WOLF_VARIANT, variantLocation));
+                    wolf.setVariant(holder);
+                },
+                () -> {
+                    System.out.println("Wolf variant key not found in registry, using direct holder (may be unsafe)");
+                    wolf.setVariant(Holder.direct(variant));
+                }
+        );
     }
 }

implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/attributes/WolfAttributes.java

@@ -56,18 +56,34 @@ private static void setAngry(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         boolean angry = Boolean.parseBoolean(value.toLowerCase());
-
         wolf.setRemainingPersistentAngerTime(angry ? 100 : 0);
     }
 
     private static void setVariant(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         Registry<WolfVariant> registry = wolf.level().registryAccess().lookupOrThrow(Registries.WOLF_VARIANT);
-        WolfVariant variant = registry.getValue(ResourceLocation.parse(value.toLowerCase()));
 
-        if (variant != null) {
-            wolf.setVariant(Holder.direct(variant));
+        ResourceLocation variantLocation = ResourceLocation.tryParse("minecraft:" + value.toLowerCase());
+        if (variantLocation == null) {
+            System.out.println("Invalid variant name: " + value);
+            return;
+        }
+
+        WolfVariant variant = registry.getOptional(variantLocation).orElse(null);
+        if (variant == null) {
+            System.out.println("Wolf variant not found: " + variantLocation);
+            return;
         }
+
+        // Get the ResourceKey from the registry
+        registry.getResourceKey(variant).ifPresentOrElse(
+                key -> {
+                    // Get the holder from the registry — this is properly bound
+                    Holder<WolfVariant> holder = registry.wrapAsHolder(variant);
+                    wolf.setVariant(holder);
+                },
+                () -> System.out.println("Wolf variant not registered: " + variantLocation)
+        );
     }
 }

implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/attributes/WolfAttributes.java

@@ -56,18 +56,34 @@ private static void setAngry(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         boolean angry = Boolean.parseBoolean(value.toLowerCase());
-
         wolf.setRemainingPersistentAngerTime(angry ? 100 : 0);
     }
 
     private static void setVariant(Npc npc, String value) {
         Wolf wolf = ReflectionHelper.getEntity(npc);
 
         Registry<WolfVariant> registry = wolf.level().registryAccess().lookupOrThrow(Registries.WOLF_VARIANT);
-        WolfVariant variant = registry.getValue(ResourceLocation.parse(value.toLowerCase()));
 
-        if (variant != null) {
-            wolf.setVariant(Holder.direct(variant));
+        ResourceLocation variantLocation = ResourceLocation.tryParse("minecraft:" + value.toLowerCase());
+        if (variantLocation == null) {
+            System.out.println("Invalid variant name: " + value);
+            return;
+        }
+
+        WolfVariant variant = registry.getOptional(variantLocation).orElse(null);
+        if (variant == null) {
+            System.out.println("Wolf variant not found: " + variantLocation);
+            return;
         }
+
+        // Get the ResourceKey from the registry
+        registry.getResourceKey(variant).ifPresentOrElse(
+                key -> {
+                    // Get the holder from the registry — this is properly bound
+                    Holder<WolfVariant> holder = registry.wrapAsHolder(variant);
+                    wolf.setVariant(holder);
+                },
+                () -> System.out.println("Wolf variant not registered: " + variantLocation)
+        );
     }
 }