Merge pull request #14 from Dev0Louis/betterCreateChildInject

No more Vanilla copy paste. We just use ci.getReturnValue() now :D
nyuppo · Nov 16, 2023 · 49a1d78 · 49a1d78
2 parents b463141 + 2acefad
commit 49a1d78
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 35 deletions.
diff --git a/src/main/java/com/github/nyuppo/mixin/ChickenVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/ChickenVariantsMixin.java
@@ -62,11 +62,10 @@ protected void onTick(CallbackInfo ci) {
 
     @Inject(
             method = "createChild(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/PassiveEntity;)Lnet/minecraft/entity/passive/ChickenEntity;",
-            at = @At("HEAD"),
-            cancellable = true
+            at = @At("RETURN")
     )
     private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfoReturnable<ChickenEntity> ci) {
-        ChickenEntity child = (ChickenEntity)EntityType.CHICKEN.create(world);
+        ChickenEntity child = ci.getReturnValue();
 
         MobVariant variant = Variants.getChildVariant(Variants.Mob.CHICKEN, world, ((ChickenEntity)(Object)this), entity);
 
@@ -75,7 +74,5 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         child.writeNbt(childNbt);
         childNbt.putString("Variant", variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
-
-        ci.setReturnValue(child);
     }
 }
diff --git a/src/main/java/com/github/nyuppo/mixin/CowVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/CowVariantsMixin.java
@@ -61,11 +61,10 @@ protected void onTick(CallbackInfo ci) {
 
     @Inject(
             method = "createChild(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/PassiveEntity;)Lnet/minecraft/entity/passive/CowEntity;",
-            at = @At("HEAD"),
-            cancellable = true
+            at = @At("RETURN")
     )
     private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfoReturnable<CowEntity> ci) {
-        CowEntity child = (CowEntity)EntityType.COW.create(world);
+        CowEntity child = ci.getReturnValue();
 
         MobVariant variant = Variants.getChildVariant(Variants.Mob.COW, world, ((CowEntity)(Object)this), entity);
 
@@ -74,7 +73,5 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         child.writeNbt(childNbt);
         childNbt.putString("Variant", variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
-
-        ci.setReturnValue(child);
     }
 }
diff --git a/src/main/java/com/github/nyuppo/mixin/PigVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/PigVariantsMixin.java
@@ -101,11 +101,10 @@ protected void onTick(CallbackInfo ci) {
 
     @Inject(
             method = "createChild(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/PassiveEntity;)Lnet/minecraft/entity/passive/PigEntity;",
-            at = @At("HEAD"),
-            cancellable = true
+            at = @At("RETURN")
     )
     private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfoReturnable<PigEntity> ci) {
-        PigEntity child = (PigEntity)EntityType.PIG.create(world);
+        PigEntity child = ci.getReturnValue();
 
         MobVariant variant = Variants.getChildVariant(Variants.Mob.PIG, world, ((PigEntity)(Object)this), entity);
 
@@ -114,7 +113,5 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         child.writeNbt(childNbt);
         childNbt.putString("Variant", variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
-
-        ci.setReturnValue(child);
     }
 }
diff --git a/src/main/java/com/github/nyuppo/mixin/SheepVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/SheepVariantsMixin.java
@@ -68,14 +68,10 @@ protected void onTick(CallbackInfo ci) {
 
     @Inject(
             method = "createChild(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/PassiveEntity;)Lnet/minecraft/entity/passive/SheepEntity;",
-            at = @At("HEAD"),
-            cancellable = true
+            at = @At("RETURN")
     )
     private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfoReturnable<SheepEntity> ci) {
-        SheepEntity child = (SheepEntity)EntityType.SHEEP.create(world);
-        if (child != null) {
-            child.setColor(this.getChildColor(((SheepEntity)(Object)this), (SheepEntity)entity));
-        }
+        SheepEntity child = ci.getReturnValue();
 
         MobVariant variant = Variants.getChildVariant(Variants.Mob.SHEEP, world, ((SheepEntity)(Object)this), entity);
 
@@ -84,7 +80,5 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         child.writeNbt(childNbt);
         childNbt.putString("Variant", variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
-
-        ci.setReturnValue(child);
     }
 }
diff --git a/src/main/java/com/github/nyuppo/mixin/WolfVariantsMixin.java b/src/main/java/com/github/nyuppo/mixin/WolfVariantsMixin.java
@@ -64,18 +64,10 @@ protected void onTick(CallbackInfo ci) {
 
     @Inject(
             method = "createChild(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/PassiveEntity;)Lnet/minecraft/entity/passive/WolfEntity;",
-            at = @At("HEAD"),
-            cancellable = true
+            at = @At("RETURN")
     )
     private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfoReturnable<WolfEntity> ci) {
-        WolfEntity child = (WolfEntity) EntityType.WOLF.create(world);
-        if (child != null) {
-            UUID uUID = ((WolfEntity)(Object)this).getOwnerUuid();
-            if (uUID != null) {
-                child.setOwnerUuid(uUID);
-                child.setTamed(true);
-            }
-        }
+        WolfEntity child = ci.getReturnValue();
 
         MobVariant variant = Variants.getChildVariant(Variants.Mob.WOLF, world, ((WolfEntity)(Object)this), entity);
 
@@ -84,7 +76,5 @@ private void onCreateChild(ServerWorld world, PassiveEntity entity, CallbackInfo
         child.writeNbt(childNbt);
         childNbt.putString("Variant", variant.getIdentifier().toString());
         child.readCustomDataFromNbt(childNbt);
-
-        ci.setReturnValue(child);
     }
 }