Moved mob-specific default variants to Variants class

nyuppo · Apr 19, 2024 · b3db225 · b3db225
1 parent 1bf6aa8
commit b3db225
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/github/nyuppo/config/Variants.java b/src/main/java/com/github/nyuppo/config/Variants.java
@@ -74,6 +74,11 @@ public static MobVariant getDefaultVariant(EntityType<?> mob) {
                 return variant;
             }
         }
+
+        if (mob == EntityType.CAT) {
+            return new MobVariant(new Identifier("tabby"), 1);
+        }
+
         return new MobVariant(MoreMobVariants.id("default"), 1);
     }
 

diff --git a/src/main/java/com/github/nyuppo/mixin/CatVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/CatVariantsMixin.java
@@ -29,7 +29,7 @@
 
 @Mixin(CatEntity.class)
 public class CatVariantsMixin extends MobEntityVariantsMixin {
-    private MobVariant variant = getDefaultVariant();
+    private MobVariant variant = Variants.getDefaultVariant(EntityType.CAT);
 
     @Override
     protected void onWriteCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
@@ -91,10 +91,6 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         childNbt.putString(MoreMobVariants.NBT_KEY, variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
     }
-
-    private MobVariant getDefaultVariant() {
-        return new MobVariant(new Identifier("tabby"), 1);
-    }
 }