From 1104a103976c5e25c0574154f841b0ed88dbb6fd Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Tue, 1 Jan 2019 15:32:02 +0100
Subject: [PATCH] move this around so that it doesn't revert the sheep color
 setting

---
 .../api/recipes/AnimalSpawnerRecipe.java           | 14 ++++++++++++--
 .../blocks/tiles/TileEntityAnimalSpawner.java      | 14 ++------------
 .../compat/jei/animal/AnimalSpawnerCategory.java   |  2 +-
 .../de/ellpeck/naturesaura/recipes/ModRecipes.java |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/de/ellpeck/naturesaura/api/recipes/AnimalSpawnerRecipe.java b/src/main/java/de/ellpeck/naturesaura/api/recipes/AnimalSpawnerRecipe.java
index 904e9339..a1a7990e 100644
--- a/src/main/java/de/ellpeck/naturesaura/api/recipes/AnimalSpawnerRecipe.java
+++ b/src/main/java/de/ellpeck/naturesaura/api/recipes/AnimalSpawnerRecipe.java
@@ -2,8 +2,10 @@ package de.ellpeck.naturesaura.api.recipes;
 
 import de.ellpeck.naturesaura.api.NaturesAuraAPI;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.EntityEntry;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -24,11 +26,19 @@ public class AnimalSpawnerRecipe {
         this.time = time;
     }
 
-    public Entity makeEntity(World world) {
+    public Entity makeEntity(World world, double x, double y, double z) {
         EntityEntry entry = ForgeRegistries.ENTITIES.getValue(this.entity);
         if (entry == null)
             return null;
-        return entry.newInstance(world);
+        Entity entity = entry.newInstance(world);
+        entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(world.rand.nextFloat() * 360F), 0F);
+        if (entity instanceof EntityLiving) {
+            EntityLiving living = (EntityLiving) entity;
+            living.rotationYawHead = entity.rotationYaw;
+            living.renderYawOffset = entity.rotationYaw;
+            living.onInitialSpawn(world.getDifficultyForLocation(living.getPosition()), null);
+        }
+        return entity;
     }
 
     public AnimalSpawnerRecipe register() {
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAnimalSpawner.java
index ab03fcd8..3b4a58cb 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAnimalSpawner.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAnimalSpawner.java
@@ -9,7 +9,6 @@ import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
 import de.ellpeck.naturesaura.packet.PacketHandler;
 import de.ellpeck.naturesaura.packet.PacketParticles;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
@@ -53,15 +52,7 @@ public class TileEntityAnimalSpawner extends TileEntityImpl implements ITickable
 
                 this.time += 10;
                 if (this.time >= this.currentRecipe.time) {
-                    Entity entity = this.currentRecipe.makeEntity(this.world);
-                    entity.setLocationAndAngles(this.spawnX, this.pos.getY() + 1, this.spawnZ,
-                            MathHelper.wrapDegrees(this.world.rand.nextFloat() * 360F), 0F);
-                    if (entity instanceof EntityLiving) {
-                        EntityLiving living = (EntityLiving) entity;
-                        living.rotationYawHead = entity.rotationYaw;
-                        living.renderYawOffset = entity.rotationYaw;
-                        living.onInitialSpawn(this.world.getDifficultyForLocation(living.getPosition()), null);
-                    }
+                    Entity entity = this.currentRecipe.makeEntity(this.world, this.spawnX, this.pos.getY() + 1, this.spawnZ);
                     this.world.spawnEntity(entity);
 
                     this.currentRecipe = null;
@@ -125,8 +116,7 @@ public class TileEntityAnimalSpawner extends TileEntityImpl implements ITickable
                     this.world.rand.nextFloat() + 0.5F);
 
             if (this.entityClient == null) {
-                this.entityClient = this.currentRecipe.makeEntity(this.world);
-                this.entityClient.setPosition(this.spawnX, this.pos.getY() + 1, this.spawnZ);
+                this.entityClient = this.currentRecipe.makeEntity(this.world, this.spawnX, this.pos.getY() + 1, this.spawnZ);
             }
             AxisAlignedBB bounds = this.entityClient.getEntityBoundingBox();
             for (int i = this.world.rand.nextInt(5) + 5; i >= 0; i--)
diff --git a/src/main/java/de/ellpeck/naturesaura/compat/jei/animal/AnimalSpawnerCategory.java b/src/main/java/de/ellpeck/naturesaura/compat/jei/animal/AnimalSpawnerCategory.java
index 5abb4190..d448485c 100644
--- a/src/main/java/de/ellpeck/naturesaura/compat/jei/animal/AnimalSpawnerCategory.java
+++ b/src/main/java/de/ellpeck/naturesaura/compat/jei/animal/AnimalSpawnerCategory.java
@@ -63,7 +63,7 @@ public class AnimalSpawnerCategory implements IRecipeCategory<AnimalSpawnerWrapp
     @Override
     public void drawExtras(Minecraft minecraft) {
         if (this.entity == null)
-            this.entity = this.recipe.makeEntity(minecraft.world);
+            this.entity = this.recipe.makeEntity(minecraft.world, 0, 0, 0);
 
         float size = Math.max(1F, Math.max(this.entity.width, this.entity.height));
         renderEntity(this.entity, 35, 28, 35F, 100F / size * 0.4F, size * 0.5F);
diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
index 74c7c94c..c62f17d2 100644
--- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
+++ b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
@@ -154,8 +154,8 @@ public final class ModRecipes {
                     500, 60, Ingredient.fromItem(ModItems.BIRTH_SPIRIT), Ingredient.fromItem(Items.MUTTON),
                     Ingredient.fromStacks(new ItemStack(Blocks.WOOL, 1, color.getMetadata()))) {
                 @Override
-                public Entity makeEntity(World world) {
-                    EntitySheep sheep = (EntitySheep) super.makeEntity(world);
+                public Entity makeEntity(World world, double x, double y, double z) {
+                    EntitySheep sheep = (EntitySheep) super.makeEntity(world, x, y, z);
                     sheep.setFleeceColor(color);
                     return sheep;
                 }