From 124612d02e42d2b78d04d460eb0c09f9b55782f2 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 30 Jan 2019 15:49:15 +0200
Subject: [PATCH] Improved cloud IA

---
 .../unicopia/entity/EntityCloud.java          | 44 ++++++++++++++-----
 .../unicopia/entity/EntityWildCloud.java      |  4 +-
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
index 3dd62519..eeb1d746 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
@@ -25,6 +25,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityFlying;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.MoverType;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.IAnimals;
@@ -65,7 +66,10 @@ public class EntityCloud extends EntityFlying implements IAnimals {
 
 	private static final DataParameter<Boolean> STATIONARY = EntityDataManager.createKey(EntityCloud.class, DataSerializers.BOOLEAN);
 
-    protected double altitude;
+    protected double targetAltitude;
+
+    protected int directionX;
+    protected int directionZ;
 
     private final double baseWidth = 3f;
     private final double baseHeight = 0.8f;
@@ -343,20 +347,29 @@ public class EntityCloud extends EntityFlying implements IAnimals {
     		super.updateAITasks();
 
 	        if (!isBeingRidden()) {
-		        double distance = altitude - posY;
+		        double distance = targetAltitude - posY;
 
 		        if (Math.abs(distance) < 1 && rand.nextInt(7000) == 0) {
-		            altitude = getRandomFlyingHeight();
-		            distance = altitude - posY;
+		            targetAltitude = getRandomFlyingHeight();
+		            distance = targetAltitude - posY;
 		        }
 
-		        if (distance < 1) {
+		        if (rand.nextInt(7000) == 0) {
+		            directionX = directionX == 0 ? rand.nextInt(3) - 1 : 0;
+		        }
+
+		        if (rand.nextInt(7000) == 0) {
+                    directionZ = directionZ == 0 ? rand.nextInt(3) - 1 : 0;
+                }
+
+		        if (Math.abs(distance) < 1) {
 		            distance = 0;
 		        }
 
-		        motionX -= 0.01;
-		        motionZ -= (Math.signum(distance) * 0.699999988079071D - motionZ) * 0.10000000149011612D;
+		        motionX -= 0.02;
+		        motionX -= (Math.signum(directionX) * 0.699999988079071D - motionX) * 0.10000000149011612D;
 		        motionY += (Math.signum(distance) * 0.699999988079071D - motionY) * 0.10000000149011612D;
+		        motionZ -= (Math.signum(directionZ) * 0.699999988079071D - motionZ) * 0.10000000149011612D;
 	        }
     	}
     }
@@ -501,9 +514,9 @@ public class EntityCloud extends EntityFlying implements IAnimals {
 				return super.attackEntityFrom(source, amount * 1.5f);
 			} else if (canFly) {
 				if (player.posY < posY) {
-	    			altitude += 5;
+	    			targetAltitude = posY + 5;
 	    		} else if (player.posY > posY) {
-	    			altitude -= 5;
+	    			targetAltitude = posY - 5;
 	    		}
 			}
     	}
@@ -588,7 +601,7 @@ public class EntityCloud extends EntityFlying implements IAnimals {
     		entity.onGround = true;
 			entity.motionY += (((floatStrength > 2 ? 1 : floatStrength/2) * 0.699999998079071D) - entity.motionY + boundModifier * 0.7) * 0.10000000149011612D;
             if (!getStationary()) {
-                entity.motionX -= 0.005;
+                entity.motionX -= 0.013;
             }
 
 			if (!getStationary() && entity.motionY > 0.4 && world.rand.nextInt(900) == 0) {
@@ -609,6 +622,17 @@ public class EntityCloud extends EntityFlying implements IAnimals {
     	return false;
     }
 
+    @Override
+    protected void doBlockCollisions() {
+        super.doBlockCollisions();
+    }
+
+    @Override
+    public void move(MoverType type, double x, double y, double z) {
+        this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
+        this.resetPositionToBB();
+    }
+
 	public int getFloatStrength(Entity entity) {
 	    if (Predicates.ENTITY_INTERACT_WITH_CLOUDS.test(entity)) {
 	        return 3;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
index 3b685f48..da8cc581 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
@@ -75,7 +75,7 @@ public class EntityWildCloud extends EntityCloud {
         if (!(pack instanceof PackData)) {
             float minSpawnHeight = getMinimumFlyingHeight();
 
-            altitude = getRandomFlyingHeight();
+            targetAltitude = getRandomFlyingHeight();
 
             if (posY < minSpawnHeight) {
                 minSpawnHeight += world.rand.nextInt(Math.max(1,  (int)getMaximumFlyingHeight() - (int)minSpawnHeight));
@@ -87,7 +87,7 @@ public class EntityWildCloud extends EntityCloud {
             pack = new PackData(this);
         } else {
             PackData packData = (PackData)pack;
-            altitude = packData.leader.altitude;
+            targetAltitude = packData.leader.targetAltitude;
 
             Vec3d position = packData.getUnOccupiedPosition(getCloudSize());